Merge branch 'master' into careminster-presence-refactor

89 files changed, 12870 insertions, 3672 deletions

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 5b4959a..e5c8cb9 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -164,6 +164,7 @@ This software uses components from the following developers:
 * log4net (http://logging.apache.org/log4net/)
 * GlynnTucker.Cache (http://gtcache.sourceforge.net/)
 * NDesk.Options 0.2.1 (http://www.ndesk.org/Options)
+* Json.NET 3.5 Release 6.  The binary used is actually Newtonsoft.Json.Net20.dll for Mono 2.4 compatability (http://james.newtonking.com/projects/json-net.aspx)
 
 Some plugins are based on Cable Beach
 Cable Beach is Copyright (c) 2008 Intel Corporation
diff --git a/OpenSim/Data/IGridUserData.cs b/OpenSim/Data/IGridUserData.cs
index abd2cef..bd7a435 100644
--- a/OpenSim/Data/IGridUserData.cs
+++ b/OpenSim/Data/IGridUserData.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Data
     /// </summary>
     public interface IGridUserData 
     {
-        GridUserData GetGridUserData(string userID);        
+        GridUserData GetGridUserData(string userID);
         bool StoreGridUserData(GridUserData data);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/MSSQLAvatarData.cs b/OpenSim/Data/MSSQL/MSSQLAvatarData.cs
index 4992183..49a6b09 100644
--- a/OpenSim/Data/MSSQL/MSSQLAvatarData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAvatarData.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Data.MSSQL
         
         public MSSQLAvatarData(string connectionString, string realm) :
                 base(connectionString, realm, "Avatar")
-        {            
+        {
         }
 
         public bool Delete(UUID principalID, string name)
diff --git a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
index 506056d..904366e 100644
--- a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Data.MSSQL
         {
             List<string> constraints = new List<string>();
             string query = string.Format(@"SELECT 
-                            COL_NAME(ic.object_id,ic.column_id) AS column_name                                
+                            COL_NAME(ic.object_id,ic.column_id) AS column_name
                             FROM sys.indexes AS i
                             INNER JOIN sys.index_columns AS ic 
                               ON i.object_id = ic.object_id AND i.index_id = ic.index_id
@@ -157,7 +157,7 @@ namespace OpenSim.Data.MSSQL
                 string where = String.Join(" AND ", terms.ToArray());
 
                 string query = String.Format("SELECT * FROM {0} WHERE {1}",
-                        m_Realm, where);                
+                        m_Realm, where);
 
                 cmd.Connection = conn;
                 cmd.CommandText = query;
@@ -296,7 +296,7 @@ namespace OpenSim.Data.MSSQL
                 query.AppendFormat("[{0}] = {1} ", names[i], values[i]);
                 if (constraints.Count > 0)
                 {
-                    List<string> terms = new List<string>();       
+                    List<string> terms = new List<string>();
                     for (int j = 0; j < constraints.Count; j++)
                     {
                         terms.Add(" [" + constraints[j].Key + "] = @" + constraints[j].Key);
diff --git a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
index b4a945c..9993720 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Data.MSSQL
 
         public MSSQLGridUserData(string connectionString, string realm) :
             base(connectionString, realm, "UserGrid")
-        {            
+        {
         }
 
         public GridUserData GetGridUserData(string userID)
@@ -58,7 +58,7 @@ namespace OpenSim.Data.MSSQL
                 return null;
 
             return ret[0];
-        }   
+        }
 
         public bool StoreGridUserData(GridUserData data)
         {
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 4309b42..575fd21 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Data.MSSQL
         /// <summary>
         /// Connection string for ADO.net
         /// </summary>
-        private readonly string connectionString;      
+        private readonly string connectionString;
 
         /// <summary>
         /// Initialize the manager and set the connectionstring
@@ -196,7 +196,7 @@ namespace OpenSim.Data.MSSQL
 
                 migration.Update();
             }
-        }        
+        }
 
         /// <summary>
         /// Returns the version of this DB provider
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
index 9f18e5e..e7c8dc5 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL
         {
         }
         //private string m_Realm;
-        //private List<string> m_ColumnNames = null;        
+        //private List<string> m_ColumnNames = null;
         //private MSSQLManager m_database;
 
         //public MSSQLUserAccountData(string connectionString, string realm)
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index 756b42d..1253e0b 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -197,7 +197,7 @@ namespace OpenSim.Data.MySQL
         public virtual T[] Get(string where)
         {
             using (MySqlCommand cmd = new MySqlCommand())
-            {            
+            {
                 string query = String.Format("select * from {0} where {1}",
                                              m_Realm, where);
                 
diff --git a/OpenSim/Data/MySQL/MySQLGridUserData.cs b/OpenSim/Data/MySQL/MySQLGridUserData.cs
index 15834d2..df29ecd 100644
--- a/OpenSim/Data/MySQL/MySQLGridUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridUserData.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Data.MySQL
                 return null;
 
             return ret[0];
-        }        
+        }
 
         public bool StoreGridUserData(GridUserData data)
         {
diff --git a/OpenSim/Data/MySQL/MySQLPresenceData.cs b/OpenSim/Data/MySQL/MySQLPresenceData.cs
index 68a68af..143dbe3 100644
--- a/OpenSim/Data/MySQL/MySQLPresenceData.cs
+++ b/OpenSim/Data/MySQL/MySQLPresenceData.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Data.MySQL
                     List<UUID> deleteSessions = new List<UUID>();
                     int online = 0;
 
-                    while(reader.Read())
+                    while (reader.Read())
                     {
                         if (bool.Parse(reader["Online"].ToString()))
                             online++;
diff --git a/OpenSim/Data/Null/NullPresenceData.cs b/OpenSim/Data/Null/NullPresenceData.cs
index 9fc4595..b98b5c9 100644
--- a/OpenSim/Data/Null/NullPresenceData.cs
+++ b/OpenSim/Data/Null/NullPresenceData.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Data.Null
         }
 
         public bool Store(PresenceData data)
-        {                      
+        {
             if (Instance != this)
                 return Instance.Store(data);
 
@@ -113,7 +113,7 @@ namespace OpenSim.Data.Null
         }
 
         public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
-        {            
+        {
             if (Instance != this)
                 return Instance.SetHomeLocation(userID, regionID, position, lookAt);
 
@@ -130,28 +130,28 @@ namespace OpenSim.Data.Null
                     p.Data["HomePosition"] = position.ToString();
                     p.Data["HomeLookAt"] = lookAt.ToString();
                     foundone = true;
-                }                
+                }
             }
 
             return foundone;
         }
 
         public PresenceData[] Get(string field, string data)
-        {            
+        {
             if (Instance != this)
                 return Instance.Get(field, data);
 
 //            m_log.DebugFormat(
-//                "[NULL PRESENCE DATA]: Getting presence data for field {0} with parameter {1}", field, data);            
+//                "[NULL PRESENCE DATA]: Getting presence data for field {0} with parameter {1}", field, data);
 
             List<PresenceData> presences = new List<PresenceData>();
             if (field == "UserID")
             {
                 foreach (PresenceData p in m_presenceData.Values)
                 {
-                    if (p.UserID == data)                        
+                    if (p.UserID == data)
                     {
-                        presences.Add(p);                    
+                        presences.Add(p);
 //                        Console.WriteLine("HOME for " + p.UserID + " is " + (p.Data.ContainsKey("HomeRegionID") ? p.Data["HomeRegionID"] : "Not found"));
                     }
                 }
@@ -194,7 +194,7 @@ namespace OpenSim.Data.Null
         }
 
         public void Prune(string userID)
-        {                       
+        {
             if (Instance != this)
             {
                 Instance.Prune(userID);
diff --git a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
index 84ce775..2c28375 100644
--- a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
@@ -120,7 +120,7 @@ namespace OpenSim.Data.SQLite
         }
 
         public bool Store(AuthenticationData data)
-        {            
+        {
             if (data.Data.ContainsKey("UUID"))
                 data.Data.Remove("UUID");
 
diff --git a/OpenSim/Framework/MultipartForm.cs b/OpenSim/Framework/MultipartForm.cs
index 8ba6d22..90c4007 100644
--- a/OpenSim/Framework/MultipartForm.cs
+++ b/OpenSim/Framework/MultipartForm.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.Net;
 using System.IO;
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index 2fc5bdf..f6d6a7c 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.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.Reflection;
 using log4net;
@@ -219,7 +246,7 @@ namespace OpenSim.Framework
         /// Parse a notecard in Linden format to a string of ordinary text.
         /// </summary>
         /// <param name="rawInput"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         public static string ParseNotecardToString(string rawInput)
         {
             string[] output = ParseNotecardToList(rawInput).ToArray();
@@ -237,7 +264,7 @@ namespace OpenSim.Framework
         /// <returns></returns>
         public static List<string> ParseNotecardToList(string rawInput)
         {
-            string[] input = rawInput.Replace("\r", "").Split('\n');            
+            string[] input = rawInput.Replace("\r", "").Split('\n');
             int idx = 0;
             int level = 0;
             List<string> output = new List<string>();
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 214f936..9a6ef77 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -202,16 +202,14 @@ namespace OpenSim.Framework.Servers.HttpServer
                 if (!m_pollHandlers.ContainsKey(methodName))
                 {
                     m_pollHandlers.Add(methodName,args);
-                    pollHandlerResult = true;
-                    
+                    pollHandlerResult = true;                    
                 }
             }
             
             if (pollHandlerResult)
                 return AddHTTPHandler(methodName, handler);
 
-            return false;
-            
+            return false;            
         }
 
         // Note that the agent string is provided simply to differentiate
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
index d13408d..65b1eb5 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         bool AddAgentHandler(string agent, IHttpAgentHandler handler);
         
         /// <summary>
-        /// Add a handler for an HTTP request
+        /// Add a handler for an HTTP request.
         /// </summary>
         /// 
         /// This handler can actually be invoked either as 
@@ -66,6 +66,10 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// or
         /// 
         /// http://localhost:9000/object/
+        ///
+        /// In addition, the handler invoked by the HTTP server for any request is the one when best matches the request
+        /// URI.  So if a handler for "/myapp/" is registered and a request for "/myapp/page" is received, then
+        /// the "/myapp/" handler is invoked if no "/myapp/page" handler exists.
         /// 
         /// <param name="methodName"></param>
         /// <param name="handler"></param>
@@ -73,7 +77,6 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// true if the handler was successfully registered, false if a handler with the same name already existed.
         /// </returns>
         bool AddHTTPHandler(string methodName, GenericHTTPMethod handler);
-
          
         bool AddPollServiceHTTPHandler(string methodName, GenericHTTPMethod handler, PollServiceEventArgs args);
 
diff --git a/OpenSim/Framework/UntrustedWebRequest.cs b/OpenSim/Framework/UntrustedWebRequest.cs
index 1af7c41..e6411cc 100644
--- a/OpenSim/Framework/UntrustedWebRequest.cs
+++ b/OpenSim/Framework/UntrustedWebRequest.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.IO;
 using System.Net;
@@ -118,7 +145,7 @@ namespace OpenSim.Framework
         /// <param name="allowLoopback">True to allow loopback addresses to be used</param>
         /// <param name="uri">The URI to test for whether it should be allowed.</param>
         /// <returns>
-        ///     <c>true</c> if [is URI allowable] [the specified URI]; otherwise, <c>false</c>.
+        ///     <c>true</c> if [is URI allowable] [the specified URI]; otherwise, <c>false</c>.
         /// </returns>
         private static bool IsUriAllowable(Uri uri, bool allowLoopback)
         {
@@ -180,7 +207,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="ip">The ip address to check.</param>
         /// <returns>
-        ///     <c>true</c> if this is a loopback IP address; <c>false</c> otherwise.
+        ///     <c>true</c> if this is a loopback IP address; <c>false</c> otherwise.
         /// </returns>
         private static bool IsIPv6Loopback(IPAddress ip)
         {
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index d9782ff..16e44af 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.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.Collections.Specialized;
 using System.IO;
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index d458364..f54e41a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -36,7 +36,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.Attachments
-{        
+{
     public class AttachmentsModule : IAttachmentsModule, IRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -67,6 +67,36 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             get { return false; }
         }
 
+        public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent)
+        {
+            m_log.Debug("[ATTACHMENTS MODULE]: Invoking AttachObject");
+            
+            // If we can't take it, we can't attach it!
+            SceneObjectPart part = m_scene.GetSceneObjectPart(objectLocalID);
+            if (part == null)
+                return;
+
+            if (!m_scene.Permissions.CanTakeObject(part.UUID, remoteClient.AgentId))
+                return;
+
+            // Calls attach with a Zero position
+            if (AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false))
+            {
+                m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
+    
+                // Save avatar attachment information
+                ScenePresence presence;
+                if (m_scene.AvatarFactory != null && m_scene.TryGetAvatar(remoteClient.AgentId, out presence))
+                {
+                    m_log.Info(
+                        "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId 
+                            + ", AttachmentPoint: " + AttachmentPt);
+                    
+                    m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
+                }
+            }
+        }
+        
         public bool AttachObject(
             IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent)
         {
@@ -138,12 +168,87 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             return true;
         }
+
+        public UUID RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
+        {
+            m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing single attachment from item {0} for {1}", itemID, remoteClient.Name);
+            
+            return RezSingleAttachmentFromInventory(remoteClient, itemID, AttachmentPt, true);
+        }
+
+        public UUID RezSingleAttachmentFromInventory(
+            IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus)
+        {                        
+            SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt);
+
+            if (updateInventoryStatus)
+            {
+                if (att == null)
+                {
+                    ShowDetachInUserInventory(itemID, remoteClient);
+                }
+    
+                SetAttachmentInventoryStatus(att, remoteClient, itemID, AttachmentPt);
+            }
+
+            if (null == att)
+                return UUID.Zero;
+            else
+                return att.UUID;            
+        }        
+
+        protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal(
+            IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
+        {
+            IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
+            if (invAccess != null)
+            {
+                SceneObjectGroup objatt = invAccess.RezObject(remoteClient,
+                    itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
+                    false, false, remoteClient.AgentId, true);
+
+//                m_log.DebugFormat(
+//                    "[ATTACHMENTS MODULE]: Retrieved single object {0} for attachment to {1} on point {2}", 
+//                    objatt.Name, remoteClient.Name, AttachmentPt);
+                
+                if (objatt != null)
+                {
+                    bool tainted = false;
+                    if (AttachmentPt != 0 && AttachmentPt != objatt.GetAttachmentPoint())
+                        tainted = true;
+
+                    AttachObject(
+                        remoteClient, objatt.LocalId, AttachmentPt, Quaternion.Identity, objatt.AbsolutePosition, false);
+                    //objatt.ScheduleGroupForFullUpdate();
+                    
+                    if (tainted)
+                        objatt.HasGroupChanged = true;
+
+                    // Fire after attach, so we don't get messy perms dialogs
+                    // 3 == AttachedRez
+                    objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 3);
+
+                    // Do this last so that event listeners have access to all the effects of the attachment
+                    m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, remoteClient.AgentId);
+                }
+                else
+                {
+                    m_log.WarnFormat(
+                        "[ATTACHMENTS MODULE]: Could not retrieve item {0} for attaching to avatar {1} at point {2}", 
+                        itemID, remoteClient.Name, AttachmentPt);
+                }
+                
+                return objatt;
+            }
+            
+            return null;
+        }        
         
         public UUID SetAttachmentInventoryStatus(
             SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
         {
             m_log.DebugFormat(
-                "[ATTACHMENTS MODULEY]: Updating inventory of {0} to show attachment of {1} (item ID {2})", 
+                "[ATTACHMENTS MODULE]: Updating inventory of {0} to show attachment of {1} (item ID {2})", 
                 remoteClient.Name, att.Name, itemID);
             
             if (!att.IsDeleted)
@@ -204,7 +309,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 if (m_scene.AvatarFactory != null)
                     m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
             }
-        }        
+        }
 
         public void ShowDetachInUserInventory(UUID itemID, IClientAPI remoteClient)
         {
@@ -222,7 +327,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
 
             DetachSingleAttachmentToInv(itemID, remoteClient);
-        }        
+        }
 
         // What makes this method odd and unique is it tries to detach using an UUID....     Yay for standards.
         // To LocalId or UUID, *THAT* is the question. How now Brown UUID??
@@ -252,6 +357,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     }
                 }
             }
-        }        
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index de324c0..312db38 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -394,11 +394,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         public IClientAPI LocateClientObject(UUID agentID)
         {
             Scene scene = GetClientScene(agentID);
-            if(scene == null)
+            if (scene == null)
                 return null;
 
             ScenePresence presence = scene.GetScenePresence(agentID);
-            if(presence == null)
+            if (presence == null)
                 return null;
 
             return presence.ControllingClient;
@@ -481,7 +481,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 m_log.DebugFormat("[FRIENDS]: {0} offered friendship to {1}", principalID, friendID);
 
                 // This user wants to be friends with the other user.
-                // Let's add both relations to the DB, but one of them is inactive (-1)
+                // Let's add the relation backwards, in case the other is not online
                 FriendsService.StoreFriend(friendID, principalID.ToString(), 0);
 
                 // Now let's ask the other user to be friends with this user
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index c0d3f31..ad050a1 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             if (!m_Enabled)
                 return;
 
-            lock(m_Scenes)
+            lock (m_Scenes)
             {
                 m_Scenes.Remove(scene);
             }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 0fc467b..16e05b7 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -576,7 +576,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     foreach (SceneObjectPart part in partList)
                     {
                         if (part.OwnerID != item.Owner)
-                        {                            
+                        {
                             part.LastOwnerID = part.OwnerID;
                             part.OwnerID = item.Owner;
                             part.Inventory.ChangeInventoryOwner(item.Owner);
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 0195c03..aaa318c 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -56,6 +56,9 @@
         <RegionModule id="RemotePresenceServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.RemotePresenceServicesConnector" />
         <RegionModule id="LocalUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.LocalUserAccountServicesConnector" />
         <RegionModule id="RemoteUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.RemoteUserAccountServicesConnector" />
+        
+        <RegionModule id="LocalGridUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser.LocalGridUserServicesConnector" />
+        
         <RegionModule id="LocalSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.LocalSimulationConnectorModule" />
         <RegionModule id="RemoteSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.RemoteSimulationConnectorModule" />
       <!-- Service connectors IN modules -->
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
index 292ff8e..63a28fc 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests
             m_LocalConnector = new LocalPresenceServicesConnector(config);
 
             // Let's stick in a test presence
-            m_LocalConnector.m_PresenceService.LoginAgent(UUID.Zero.ToString(), UUID.Zero, UUID.Zero);           
+            m_LocalConnector.m_PresenceService.LoginAgent(UUID.Zero.ToString(), UUID.Zero, UUID.Zero);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests
                 p.Data = new Dictionary<string, string>();
                 p.Data["Online"] = true.ToString();
                 m_presenceData.Add(UUID.Zero, p);
-                */            
+                */
 
             string user1 = UUID.Zero.ToString();
             UUID session1 = UUID.Zero;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
index 07fee79..30ebb21 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
@@ -73,33 +73,31 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
                     IConfig userConfig = source.Configs["UserAccountService"];
                     if (userConfig == null)
                     {
-                        m_log.Error("[USER CONNECTOR]: UserAccountService missing from OpenSim.ini");
+                        m_log.Error("[LOCAL USER ACCOUNT SERVICE CONNECTOR]: UserAccountService missing from OpenSim.ini");
                         return;
                     }
 
-                    string serviceDll = userConfig.GetString("LocalServiceModule",
-                            String.Empty);
+                    string serviceDll = userConfig.GetString("LocalServiceModule", String.Empty);
 
                     if (serviceDll == String.Empty)
                     {
-                        m_log.Error("[USER CONNECTOR]: No LocalServiceModule named in section UserService");
+                        m_log.Error("[LOCAL USER ACCOUNT SERVICE CONNECTOR]: No LocalServiceModule named in section UserService");
                         return;
                     }
 
                     Object[] args = new Object[] { source };
-                    m_UserService =
-                            ServerUtils.LoadPlugin<IUserAccountService>(serviceDll,
-                            args);
+                    m_UserService = ServerUtils.LoadPlugin<IUserAccountService>(serviceDll, args);
 
                     if (m_UserService == null)
                     {
-                        m_log.Error("[USER CONNECTOR]: Can't load user account service");
+                        m_log.ErrorFormat(
+                            "[LOCAL USER ACCOUNT SERVICE CONNECTOR]: Cannot load user account service specified as {0}", serviceDll);
                         return;
                     }
                     m_Enabled = true;
                     m_Cache = new UserAccountCache();
 
-                    m_log.Info("[USER CONNECTOR]: Local user connector enabled");
+                    m_log.Info("[LOCAL USER ACCOUNT SERVICE CONNECTOR]: Local user connector enabled");
                 }
             }
         }
@@ -134,6 +132,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
         {
             if (!m_Enabled)
                 return;
+
+            m_log.InfoFormat("[LOCAL USER ACCOUNT SERVICE CONNECTOR]: Enabled local user accounts for region {0}", scene.RegionInfo.RegionName);
         }
 
         #endregion
@@ -142,26 +142,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 
         public UserAccount GetUserAccount(UUID scopeID, UUID userID)
         {
-            UserAccount account = m_Cache.Get(userID);
-            if (account != null)
+            bool inCache = false;
+            UserAccount account = m_Cache.Get(userID, out inCache);
+            if (inCache)
                 return account;
 
             account = m_UserService.GetUserAccount(scopeID, userID);
-            if (account != null)
-                m_Cache.Cache(account);
+            m_Cache.Cache(userID, account);
 
             return account;
         }
 
         public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
         {
-            UserAccount account = m_Cache.Get(firstName + " " + lastName);
-            if (account != null)
+            bool inCache = false;
+            UserAccount account = m_Cache.Get(firstName + " " + lastName, out inCache);
+            if (inCache)
                 return account;
 
             account = m_UserService.GetUserAccount(scopeID, firstName, lastName);
             if (account != null)
-                m_Cache.Cache(account);
+                m_Cache.Cache(account.PrincipalID, account);
 
             return account;
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
index 1140692..488dbd5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
@@ -119,26 +119,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 
         public override UserAccount GetUserAccount(UUID scopeID, UUID userID)
         {
-            UserAccount account = m_Cache.Get(userID);
-            if (account != null)
+            bool inCache = false;
+            UserAccount account = m_Cache.Get(userID, out inCache);
+            if (inCache)
                 return account;
 
             account = base.GetUserAccount(scopeID, userID);
-            if (account != null)
-                m_Cache.Cache(account);
+            m_Cache.Cache(userID, account);
 
             return account;
         }
 
         public override UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
         {
-            UserAccount account = m_Cache.Get(firstName + " " + lastName);
-            if (account != null)
+            bool inCache = false;
+            UserAccount account = m_Cache.Get(firstName + " " + lastName, out inCache);
+            if (inCache)
                 return account;
 
             account = base.GetUserAccount(scopeID, firstName, lastName);
             if (account != null)
-                m_Cache.Cache(account);
+                m_Cache.Cache(account.PrincipalID, account);
 
             return account;
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
index e430fc7..a355661 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
@@ -36,50 +36,58 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 {
     public class UserAccountCache
     {
-        //private static readonly ILog m_log =
-        //        LogManager.GetLogger(
-        //        MethodBase.GetCurrentMethod().DeclaringType);
-        
-        private ICnmCache<UUID, UserAccount> m_UUIDCache;
-        private Dictionary<string, UUID> m_NameCache;
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+        private ExpiringCache<UUID, UserAccount> m_UUIDCache;
+        private ExpiringCache<string, UUID> m_NameCache;
 
         public UserAccountCache()
         {
             // Warning: the size values are a bit fuzzy. What matters
             // most for this cache is the count value (128 entries).
-            m_UUIDCache = CnmSynchronizedCache<UUID, UserAccount>.Synchronized(new CnmMemoryCache<UUID, UserAccount>(
-                        128, 128*512, TimeSpan.FromMinutes(30.0)));
-            m_NameCache = new Dictionary<string, UUID>(); // this one is unbound
+            m_UUIDCache = new ExpiringCache<UUID, UserAccount>();
+            m_NameCache = new ExpiringCache<string, UUID>(); // this one is unbound
         }
 
-        public void Cache(UserAccount account)
+        public void Cache(UUID userID, UserAccount account)
         {
-            m_UUIDCache.Set(account.PrincipalID, account, 512);
-            m_NameCache[account.Name] = account.PrincipalID;
+            // Cache even null accounts
+            m_UUIDCache.AddOrUpdate(userID, account, DateTime.Now + TimeSpan.FromMinutes(2.0d));
+            if (account != null)
+                m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, DateTime.Now + TimeSpan.FromMinutes(2.0d));
 
-            //m_log.DebugFormat("[USER CACHE]: cached user {0} {1}", account.FirstName, account.LastName);
+            m_log.DebugFormat("[USER CACHE]: cached user {0}", userID);
         }
 
-        public UserAccount Get(UUID userID)
+        public UserAccount Get(UUID userID, out bool inCache)
         {
             UserAccount account = null;
+            inCache = false;
             if (m_UUIDCache.TryGetValue(userID, out account))
             {
                 //m_log.DebugFormat("[USER CACHE]: Account {0} {1} found in cache", account.FirstName, account.LastName);
+                inCache = true;
                 return account;
             }
 
             return null;
         }
 
-        public UserAccount Get(string name)
+        public UserAccount Get(string name, out bool inCache)
         {
-            if (!m_NameCache.ContainsKey(name))
+            inCache = false;
+            if (!m_NameCache.Contains(name))
                 return null;
 
             UserAccount account = null;
-            if (m_UUIDCache.TryGetValue(m_NameCache[name], out account))
-                return account;
+            UUID uuid = UUID.Zero;
+            if (m_NameCache.TryGetValue(name, out uuid))
+                if (m_UUIDCache.TryGetValue(uuid, out account))
+                {
+                    inCache = true;
+                    return account;
+                }
 
             return null;
         }
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index e0cdb36..bf856c8 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -183,7 +183,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         void ClientOnPreAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
         {
             //If we are forcing a position for them to go
-            if( forcedPosition != null )
+            if (forcedPosition != null)
             {
                 ScenePresence clientAvatar = m_scene.GetScenePresence(remoteClient.AgentId);
 
@@ -199,7 +199,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     forcedPosition = null;
                 }
                 //if we are far away, teleport 
-                else if(Vector3.Distance(clientAvatar.AbsolutePosition,forcedPosition.Value) > 3 )
+                else if (Vector3.Distance(clientAvatar.AbsolutePosition,forcedPosition.Value) > 3)
                 {
                     Debug.WriteLine(string.Format("Teleporting out because {0} is too far from avatar position {1}",forcedPosition.Value,clientAvatar.AbsolutePosition));
                     clientAvatar.Teleport(forcedPosition.Value);
@@ -340,7 +340,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void SendYouAreRestrictedNotice(ScenePresence avatar)
         {
-            avatar.ControllingClient.SendAlertMessage( 
+            avatar.ControllingClient.SendAlertMessage(
                 "You are not allowed on this parcel because the land owner has restricted access.");
             
         }
@@ -475,7 +475,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                             ForceAvatarToPosition(clientAvatar, m_scene.GetNearestAllowedPosition(clientAvatar));
                         }
                     }
-                    else if ( parcel.IsRestrictedFromLand(clientAvatar.UUID))
+                    else if (parcel.IsRestrictedFromLand(clientAvatar.UUID))
                     {
                         //once we've sent the message once, keep going toward the target until we are done
                         if (forcedPosition == null)
@@ -487,7 +487,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     else
                     {
                         //when we are finally in a safe place, lets release the forced position lock
-                        forcedPosition = null;   
+                        forcedPosition = null;
                     }
                 }
             }
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 27d9fdb..e85136a 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -287,7 +287,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 entry.Flags = AccessList.Ban;
                 entry.Time = new DateTime();
                 //See if they are on the list, but make sure the owner isn't banned
-                if (LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar )
+                if (LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar)
                 {
                     //They are banned, so lets send them a notice about this parcel
                     return true;
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 845c4c2..5c7f3b7 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -618,7 +618,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 return objectOwnerMask;
 
             // Estate users should be able to edit anything in the sim if RegionOwnerIsGod is set
-            if (IsEstateManager(user) && m_RegionOwnerIsGod)
+            if (m_RegionOwnerIsGod && IsEstateManager(user) && !IsAdministrator(objectOwner))
                 return objectOwnerMask;
 
             // Admin should be able to edit anything in the sim (including admin objects)
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 367ff3d..0222b02 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -31,21 +31,55 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Interfaces
-{        
+{
     public interface IAttachmentsModule
     {
         /// <summary>
+        /// Attach an object to an avatar from the world.
+        /// </summary>
+        /// <param name="controllingClient"></param>
+        /// <param name="localID"></param>
+        /// <param name="attachPoint"></param>
+        /// <param name="rot"></param>
+        /// <param name="silent"></param>
+        void AttachObject(
+            IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent);
+
+        /// <summary>
         /// Attach an object to an avatar.
         /// </summary>
         /// <param name="controllingClient"></param>
         /// <param name="localID"></param>
         /// <param name="attachPoint"></param>
         /// <param name="rot"></param>
-        /// <param name="pos"></param>
+        /// <param name="attachPos"></param>
         /// <param name="silent"></param>
         /// <returns>true if the object was successfully attached, false otherwise</returns>        
         bool AttachObject(
-            IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos, bool silent);
+            IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent);
+
+        /// <summary>
+        /// Rez an attachment from user inventory and change inventory status to match.
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="itemID"></param>
+        /// <param name="AttachmentPt"></param>
+        /// <returns>The scene object that was attached.  Null if the scene object could not be found</returns>
+        UUID RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
+
+        /// <summary>
+        /// Rez an attachment from user inventory
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="itemID"></param>
+        /// <param name="AttachmentPt"></param>
+        /// <param name="updateinventoryStatus">
+        /// If true, we also update the user's inventory to show that the attachment is set.  If false, we do not.
+        /// False is required so that we don't attempt to update information when a user enters a scene with the
+        /// attachment already correctly set up in inventory.
+        /// <returns>The uuid of the scene object that was attached.  Null if the scene object could not be found</returns>
+        UUID RezSingleAttachmentFromInventory(
+            IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus);
 
         /// <summary>
         /// Update the user inventory to the attachment of an item
@@ -54,7 +88,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="remoteClient"></param>
         /// <param name="itemID"></param>
         /// <param name="AttachmentPt"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         UUID SetAttachmentInventoryStatus(
             SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
 
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
index 2401402..8185258 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.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 OpenSim.Framework;
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 1650946..37a51d9 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -113,15 +113,15 @@ namespace OpenSim.Region.Framework.Scenes
         /// Fired when an object is touched/grabbed.
         /// </summary>
         /// The originalID is the local ID of the part that was actually touched.  The localID itself is always that of
-        /// the root part.        
+        /// the root part.
         public event ObjectGrabDelegate OnObjectGrab;
-        public delegate void ObjectGrabDelegate(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs);        
+        public delegate void ObjectGrabDelegate(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs);
         
         public event ObjectGrabDelegate OnObjectGrabbing;
         public event ObjectDeGrabDelegate OnObjectDeGrab;
         public event ScriptResetDelegate OnScriptReset;
 
-        public event OnPermissionErrorDelegate OnPermissionError;        
+        public event OnPermissionErrorDelegate OnPermissionError;
 
         /// <summary>
         /// Fired when a new script is created.
@@ -169,7 +169,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public delegate void ClientClosed(UUID clientID, Scene scene);
 
-        public event ClientClosed OnClientClosed;        
+        public event ClientClosed OnClientClosed;
 
         /// <summary>
         /// This is fired when a scene object property that a script might be interested in (such as color, scale or
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index eb51019..6ebd048 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1106,18 +1106,18 @@ namespace OpenSim.Region.Framework.Scenes
             if (folder == null)
                 return;
 
-            m_log.DebugFormat("[AGENT INVENTORY]: Send Inventory Folder {0} Update to {1} {2}", folder.Name, client.FirstName, client.LastName);
+            // Fetch the folder contents
             InventoryCollection contents = InventoryService.GetFolderContent(client.AgentId, folder.ID);
-            InventoryFolderBase containingFolder = new InventoryFolderBase();
-            containingFolder.ID = folder.ID;
-            containingFolder.Owner = client.AgentId;
+
+            // Fetch the folder itself to get its current version
+            InventoryFolderBase containingFolder = new InventoryFolderBase(folder.ID, client.AgentId);
             containingFolder = InventoryService.GetFolder(containingFolder);
-            if (containingFolder != null)
-            {
-                int version = containingFolder.Version;
 
-                client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, version, fetchFolders, fetchItems);
-            }
+            //m_log.DebugFormat("[AGENT INVENTORY]: Sending inventory folder contents ({0} nodes) for \"{1}\" to {2} {3}",
+            //    contents.Folders.Count + contents.Items.Count, containingFolder.Name, client.FirstName, client.LastName);
+
+            if (containingFolder != null)
+                client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, containingFolder.Version, fetchFolders, fetchItems);
         }
 
         /// <summary>
@@ -1846,35 +1846,12 @@ namespace OpenSim.Region.Framework.Scenes
             EventManager.TriggerOnAttach(localID, itemID, avatarID);
         }
 
-        /// <summary>
-        /// Called when the client receives a request to rez a single attachment on to the avatar from inventory
-        /// (RezSingleAttachmentFromInv packet).
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="itemID"></param>
-        /// <param name="AttachmentPt"></param>
-        /// <returns></returns>
-        public UUID RezSingleAttachment(IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
-        {
-            m_log.DebugFormat("[USER INVENTORY]: Rezzing single attachment from item {0} for {1}", itemID, remoteClient.Name);
-            
-            SceneObjectGroup att = m_sceneGraph.RezSingleAttachment(remoteClient, itemID, AttachmentPt);
-
-            if (att == null)
-            {
-                AttachmentsModule.ShowDetachInUserInventory(itemID, remoteClient);
-                return UUID.Zero;
-            }
-
-            return AttachmentsModule.SetAttachmentInventoryStatus(att, remoteClient, itemID, AttachmentPt);
-        }
-
         public void RezMultipleAttachments(IClientAPI remoteClient, RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header,
                                        RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects)
         {
             foreach (RezMultipleAttachmentsFromInvPacket.ObjectDataBlock obj in objects)
             {
-                RezSingleAttachment(remoteClient, obj.ItemID, obj.AttachmentPt);
+                AttachmentsModule.RezSingleAttachmentFromInventory(remoteClient, obj.ItemID, obj.AttachmentPt);
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d5d1825..03f1ee2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2003,7 +2003,7 @@ namespace OpenSim.Region.Framework.Scenes
         public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
         {
             return m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates);
-        }        
+        }
 
         /// <summary>
         /// Delete every object from the scene
@@ -2365,10 +2365,10 @@ namespace OpenSim.Region.Framework.Scenes
             //m_log.DebugFormat(" >>> IncomingCreateObject(userID, itemID) <<< {0} {1}", userID, itemID);
             
             ScenePresence sp = GetScenePresence(userID);
-            if (sp != null)
+            if (sp != null && AttachmentsModule != null)
             {
-                uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID);
-                m_sceneGraph.RezSingleAttachment(sp.ControllingClient, itemID, attPt);
+                uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID);                
+                AttachmentsModule.RezSingleAttachmentFromInventory(sp.ControllingClient, itemID, attPt);
             }
 
             return false;
@@ -2669,14 +2669,16 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         public virtual void SubscribeToClientAttachmentEvents(IClientAPI client)
-        {
-            client.OnRezSingleAttachmentFromInv += RezSingleAttachment;
+        {            
             client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachments;            
-            client.OnObjectAttach += m_sceneGraph.AttachObject;
             client.OnObjectDetach += m_sceneGraph.DetachObject;
 
             if (AttachmentsModule != null)
+            {
+                client.OnRezSingleAttachmentFromInv += AttachmentsModule.RezSingleAttachmentFromInventory;
+                client.OnObjectAttach += AttachmentsModule.AttachObject;
                 client.OnDetachAttachmentIntoInv += AttachmentsModule.ShowDetachInUserInventory;
+            }
         }
 
         public virtual void SubscribeToClientTeleportEvents(IClientAPI client)
@@ -2723,7 +2725,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         protected virtual void UnsubscribeToClientEvents(IClientAPI client)
-        {            
+        {
         }
 
         /// <summary>
@@ -2801,7 +2803,6 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnRezObject -= RezObject;
         }
 
-
         public virtual void UnSubscribeToClientInventoryEvents(IClientAPI client)
         {
             client.OnCreateNewInventoryItem -= CreateNewInventoryItem;
@@ -2824,14 +2825,16 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         public virtual void UnSubscribeToClientAttachmentEvents(IClientAPI client)
-        {            
-            client.OnRezMultipleAttachmentsFromInv -= RezMultipleAttachments;
-            client.OnRezSingleAttachmentFromInv -= RezSingleAttachment;            
-            client.OnObjectAttach -= m_sceneGraph.AttachObject;
+        {
+            client.OnRezMultipleAttachmentsFromInv -= RezMultipleAttachments;            
             client.OnObjectDetach -= m_sceneGraph.DetachObject;
 
-            if (AttachmentsModule != null)               
+            if (AttachmentsModule != null)
+            {
+                client.OnRezSingleAttachmentFromInv -= AttachmentsModule.RezSingleAttachmentFromInventory;            
+                client.OnObjectAttach -= AttachmentsModule.AttachObject;
                 client.OnDetachAttachmentIntoInv -= AttachmentsModule.ShowDetachInUserInventory;
+            }
         }
 
         public virtual void UnSubscribeToClientTeleportEvents(IClientAPI client)
@@ -3559,7 +3562,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             foreach (var parcel in AllParcels())
             {
-                if( parcel.ContainsPoint((int)x,(int)y))
+                if (parcel.ContainsPoint((int)x,(int)y))
                 {
                     return parcel;
                 }
@@ -4998,7 +5001,7 @@ namespace OpenSim.Region.Framework.Scenes
         private Vector3 GetPositionAtAvatarHeightOrGroundHeight(ScenePresence avatar, float x, float y)
         {
             Vector3 ground = GetPositionAtGround(x, y);
-            if( avatar.AbsolutePosition.Z > ground.Z)
+            if (avatar.AbsolutePosition.Z > ground.Z)
             {
                 ground.Z = avatar.AbsolutePosition.Z;
             }
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 4e41b07..db70d6a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -510,94 +510,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        /// <summary>
-        /// Event Handling routine for Attach Object
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="objectLocalID"></param>
-        /// <param name="AttachmentPt"></param>
-        /// <param name="rot"></param>
-        protected internal void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent)
-        {
-            // If we can't take it, we can't attach it!
-            SceneObjectPart part = m_parentScene.GetSceneObjectPart(objectLocalID);
-            if (part == null)
-                return;
-
-            if (!m_parentScene.Permissions.CanTakeObject(part.UUID, remoteClient.AgentId))
-                return;
-
-            // Calls attach with a Zero position
-            if (m_parentScene.AttachmentsModule.AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false))
-            {
-                m_parentScene.SendAttachEvent(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
-    
-                // Save avatar attachment information
-                ScenePresence presence;
-                if (m_parentScene.AvatarFactory != null && m_parentScene.TryGetAvatar(remoteClient.AgentId, out presence))
-                {
-                    m_log.Info(
-                        "[SCENE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId 
-                            + ", AttachmentPoint: " + AttachmentPt);
-                    
-                    m_parentScene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Rez an attachment
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="itemID"></param>
-        /// <param name="AttachmentPt"></param>
-        /// <returns>The scene object that was attached.  Null if the scene object could not be found</returns>
-        public SceneObjectGroup RezSingleAttachment(IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
-        {
-            IInventoryAccessModule invAccess = m_parentScene.RequestModuleInterface<IInventoryAccessModule>();
-            if (invAccess != null)
-            {
-                SceneObjectGroup objatt = invAccess.RezObject(remoteClient,
-                    itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
-                    false, false, remoteClient.AgentId, true);
-
-//                m_log.DebugFormat(
-//                    "[SCENE GRAPH]: Retrieved single object {0} for attachment to {1} on point {2}", 
-//                    objatt.Name, remoteClient.Name, AttachmentPt);
-                
-                if (objatt != null)
-                {
-                    bool tainted = false;
-                    if (AttachmentPt != 0 && AttachmentPt != objatt.GetAttachmentPoint())
-                        tainted = true;
-
-                    m_parentScene.AttachmentsModule.AttachObject(
-                        remoteClient, objatt.LocalId, AttachmentPt, Quaternion.Identity, objatt.AbsolutePosition, false);
-                    //objatt.ScheduleGroupForFullUpdate();
-                    
-                    if (tainted)
-                        objatt.HasGroupChanged = true;
-
-                    // Fire after attach, so we don't get messy perms dialogs
-                    // 3 == AttachedRez
-                    objatt.CreateScriptInstances(0, true, m_parentScene.DefaultScriptEngine, 3);
-
-                    // Do this last so that event listeners have access to all the effects of the attachment
-                    m_parentScene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, remoteClient.AgentId);
-                }
-                else
-                {
-                    m_log.WarnFormat(
-                        "[SCENE GRAPH]: Could not retrieve item {0} for attaching to avatar {1} at point {2}", 
-                        itemID, remoteClient.Name, AttachmentPt);
-                }
-                
-                return objatt;
-            }
-            
-            return null;
-        }
-
         protected internal ScenePresence CreateAndAddChildScenePresence(IClientAPI client, AvatarAppearance appearance)
         {
             ScenePresence newAvatar = null;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6c4b39d..d083119 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -645,7 +645,7 @@ namespace OpenSim.Region.Framework.Scenes
             ApplyPhysics(m_scene.m_physicalPrim);
 
             // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled
-            // for the same object with very different properties.  The caller must schedule the update.            
+            // for the same object with very different properties.  The caller must schedule the update.
             //ScheduleGroupForFullUpdate();
         }
 
@@ -2185,11 +2185,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// Immediately send a full update for this scene object.
         /// </summary>
         public void SendGroupFullUpdate()
-        {                       
+        {
             if (IsDeleted)
                 return;
 
-//            m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);            
+//            m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);
             
             RootPart.SendFullUpdateToAllClients();
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index c8ac014..48e34ee 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2060,6 +2060,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_lastColliders.Remove(localID);
             }
+
             if (m_parentGroup == null)
                 return;
             if (m_parentGroup.IsDeleted)
@@ -2855,7 +2856,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 SendFullUpdateToClient(remoteClient, clientFlags);
             }
-        }        
+        }
 
         /// <summary>
         /// Send a full update for this part to all clients.
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d8f93d7..24179a9 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -686,7 +686,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid);
 
-            m_userLevel = account.UserLevel;
+            if (account != null)
+                m_userLevel = account.UserLevel;
 
             IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
             if (gm != null)
@@ -3957,7 +3958,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (null == m_appearance)
             {
-                m_log.WarnFormat("[ATTACHMENT] Appearance has not been initialized for agent {0}", UUID);
+                m_log.WarnFormat("[ATTACHMENT]: Appearance has not been initialized for agent {0}", UUID);
                 return;
             }
 
@@ -3981,12 +3982,12 @@ namespace OpenSim.Region.Framework.Scenes
                 try
                 {
                     // Rez from inventory
-                    UUID asset = m_scene.RezSingleAttachment(ControllingClient,
-                            itemID, (uint)p);
-
-                    m_log.InfoFormat("[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {2} ({3})",
-                            p, itemID, assetID, asset);
+                    UUID asset 
+                        = m_scene.AttachmentsModule.RezSingleAttachmentFromInventory(ControllingClient, itemID, (uint)p);
 
+                    m_log.InfoFormat(
+                        "[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {2} ({3})",
+                        p, itemID, assetID, asset);
                 }
                 catch (Exception e)
                 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index b50d4ca..78f2ae3 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -86,6 +86,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestDeleteSceneObjectAsync()
         {
             TestHelper.InMethod();
+            //log4net.Config.XmlConfigurator.Configure();
             
             UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
             
@@ -97,15 +98,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
 
-            try
-            {
-                IClientAPI client = SceneSetupHelpers.AddRootAgent(scene, agentId);
-                scene.DeRezObject(client, part.LocalId, UUID.Zero, DeRezAction.Delete, UUID.Zero);
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine("Exception: " + e.StackTrace);
-            }
+            IClientAPI client = SceneSetupHelpers.AddRootAgent(scene, agentId);
+            scene.DeRezObject(client, part.LocalId, UUID.Zero, DeRezAction.Delete, UUID.Zero);
+
             SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
 
             Assert.That(retrievedPart, Is.Not.Null);
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
index 198962b..f13c323 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
@@ -108,12 +108,11 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         private bool[] m_colliderarr = new bool[11];
         private bool[] m_colliderGroundarr = new bool[11];
 
-
-
         private BulletDotNETScene m_parent_scene;
 
         public int m_eventsubscription = 0;
-        // private CollisionEventUpdate CollisionEventsThisFrame = new CollisionEventUpdate();
+        private CollisionEventUpdate CollisionEventsThisFrame = null;
+        private int m_requestedUpdateFrequency = 0;
 
         public BulletDotNETCharacter(string avName, BulletDotNETScene parent_scene, Vector3 pos, Vector3 size, float pid_d, float pid_p, float capsule_radius, float tensor, float density, float height_fudge_factor, float walk_divisor, float rundivisor)
         {
@@ -212,7 +211,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             m_mass = Mass;
 
             Body = new btRigidBody(m_mass, m_bodyMotionState, Shell);
-            Body.setUserPointer(new IntPtr((int)Body.Handle));
+            // this is used for self identification. User localID instead of body handle
+            Body.setUserPointer(new IntPtr((int)m_localID));
             
             if (ClosestCastResult != null)
                 ClosestCastResult.Dispose();
@@ -716,6 +716,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         public override void SubscribeEvents(int ms)
         {
             m_eventsubscription = ms;
+            m_requestedUpdateFrequency = ms;
             m_parent_scene.addCollisionEventReporting(this);
         }
 
@@ -723,6 +724,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         {
              m_parent_scene.remCollisionEventReporting(this);
             m_eventsubscription = 0;
+            m_requestedUpdateFrequency = 0;
         }
 
         public override bool SubscribedEvents()
@@ -732,6 +734,29 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             return false;
         }
 
+        public void AddCollision(uint collideWith, ContactPoint contact)
+        {
+            if (CollisionEventsThisFrame == null)
+            {
+                CollisionEventsThisFrame = new CollisionEventUpdate();
+            }
+            CollisionEventsThisFrame.addCollider(collideWith, contact);
+        }
+
+        public void SendCollisions()
+        {
+            if (m_eventsubscription >= m_requestedUpdateFrequency)
+            {
+                if (CollisionEventsThisFrame != null)
+                {
+                    base.SendCollisionUpdate(CollisionEventsThisFrame);
+                }
+                CollisionEventsThisFrame = new CollisionEventUpdate();
+                m_eventsubscription = 0;
+            }
+            return;
+        }
+
         internal void Dispose()
         {
             if (Body.isInWorld())
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
index 920ed96..dc3229a 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
@@ -154,7 +154,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         private Vector3 _target_velocity;
 
         public int m_eventsubscription;
-        // private CollisionEventUpdate CollisionEventsThisFrame = null;
+        private int m_requestedUpdateFrequency = 0;
+        private CollisionEventUpdate CollisionEventsThisFrame = null;
 
         public volatile bool childPrim;
 
@@ -595,6 +596,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         public override void SubscribeEvents(int ms)
         {
             m_eventsubscription = ms;
+            m_requestedUpdateFrequency = ms;
             _parent_scene.addCollisionEventReporting(this);
         }
 
@@ -602,6 +604,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         {
             _parent_scene.remCollisionEventReporting(this);
             m_eventsubscription = 0;
+            m_requestedUpdateFrequency = 0;
         }
 
         public override bool SubscribedEvents()
@@ -611,7 +614,28 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
         #endregion
 
+        public void AddCollision(uint collideWith, ContactPoint contact)
+        {
+            if (CollisionEventsThisFrame == null)
+            {
+                CollisionEventsThisFrame = new CollisionEventUpdate();
+            }
+            CollisionEventsThisFrame.addCollider(collideWith, contact);
+        }
 
+        public void SendCollisions()
+        {
+            if (m_eventsubscription >= m_requestedUpdateFrequency)
+            {
+                if (CollisionEventsThisFrame != null)
+                {
+                    base.SendCollisionUpdate(CollisionEventsThisFrame);
+                }
+                CollisionEventsThisFrame = null;
+                // m_eventsubscription = 0;
+            }
+            return;
+        }
 
         internal void Dispose()
         {
@@ -759,7 +783,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         {
             if (m_taintadd)
             {
-                m_log.Debug("[PHYSICS]: TaintAdd");
+                // m_log.Debug("[PHYSICS]: TaintAdd");
                 changeadd(timestep);
             }
 
@@ -771,7 +795,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                     SetBody(Mass);
                 else
                     SetBody(0);
-                m_log.Debug("[PHYSICS]: GEOM_DOESNT_EXSIT");
+                // m_log.Debug("[PHYSICS]: GEOM_DOESNT_EXSIT");
             }
 
             if (prim_geom.Handle == IntPtr.Zero)
@@ -782,31 +806,31 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                     SetBody(Mass);
                 else
                     SetBody(0);
-                m_log.Debug("[PHYSICS]: GEOM_DOESNT_EXSIT");
+                // m_log.Debug("[PHYSICS]: GEOM_DOESNT_EXSIT");
 
             }
 
             if (!_position.ApproxEquals(m_taintposition, 0f))
             {
-                m_log.Debug("[PHYSICS]: TaintMove");
+                // m_log.Debug("[PHYSICS]: TaintMove");
                 changemove(timestep);
             }
             if (m_taintrot != _orientation)
             {
-                m_log.Debug("[PHYSICS]: TaintRotate");
+                // m_log.Debug("[PHYSICS]: TaintRotate");
                 rotate(timestep);
             } //
 
             if (m_taintPhysics != m_isphysical && !(m_taintparent != _parent))
             {
-                m_log.Debug("[PHYSICS]: TaintPhysics");
+                // m_log.Debug("[PHYSICS]: TaintPhysics");
                 changePhysicsStatus(timestep);
             }
             //
 
             if (!_size.ApproxEquals(m_taintsize, 0f))
             {
-                m_log.Debug("[PHYSICS]: TaintSize");
+                // m_log.Debug("[PHYSICS]: TaintSize");
                 changesize(timestep);
             }
 
@@ -814,43 +838,43 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
             if (m_taintshape)
             {
-                m_log.Debug("[PHYSICS]: TaintShape");
+                // m_log.Debug("[PHYSICS]: TaintShape");
                 changeshape(timestep);
             } //
 
             if (m_taintforce)
             {
-                m_log.Debug("[PHYSICS]: TaintForce");
+                // m_log.Debug("[PHYSICS]: TaintForce");
                 changeAddForce(timestep);
             }
             if (m_taintaddangularforce)
             {
-                m_log.Debug("[PHYSICS]: TaintAngularForce");
+                // m_log.Debug("[PHYSICS]: TaintAngularForce");
                 changeAddAngularForce(timestep);
             }
             if (!m_taintTorque.ApproxEquals(Vector3.Zero, 0.001f))
             {
-                m_log.Debug("[PHYSICS]: TaintTorque");
+                // m_log.Debug("[PHYSICS]: TaintTorque");
                 changeSetTorque(timestep);
             }
             if (m_taintdisable)
             {
-                m_log.Debug("[PHYSICS]: TaintDisable");
+                // m_log.Debug("[PHYSICS]: TaintDisable");
                 changedisable(timestep);
             }
             if (m_taintselected != m_isSelected)
             {
-                m_log.Debug("[PHYSICS]: TaintSelected");
+                // m_log.Debug("[PHYSICS]: TaintSelected");
                 changeSelectedStatus(timestep);
             }
             if (!m_taintVelocity.ApproxEquals(Vector3.Zero, 0.001f))
             {
-                m_log.Debug("[PHYSICS]: TaintVelocity");
+                // m_log.Debug("[PHYSICS]: TaintVelocity");
                 changevelocity(timestep);
             }
             if (m_taintparent != _parent)
             {
-                m_log.Debug("[PHYSICS]: TaintLink");
+                // m_log.Debug("[PHYSICS]: TaintLink");
                 changelink(timestep);
             }
             if (m_taintCollidesWater != m_collidesWater)
@@ -859,7 +883,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             }
             if (!m_angularlock.ApproxEquals(m_taintAngularLock, 0))
             {
-                m_log.Debug("[PHYSICS]: TaintAngularLock");
+                // m_log.Debug("[PHYSICS]: TaintAngularLock");
                 changeAngularLock(timestep);
             }
             if (m_taintremove)
@@ -917,7 +941,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         private void changemove(float timestep)
         {
 
-            m_log.Debug("[PHYSICS]: _________ChangeMove");
+            // m_log.Debug("[PHYSICS]: _________ChangeMove");
             if (!m_isphysical)
             {
                 tempTransform2 = Body.getWorldTransform();
@@ -977,7 +1001,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
         private void rotate(float timestep)
         {
-            m_log.Debug("[PHYSICS]: _________ChangeRotate");
+            // m_log.Debug("[PHYSICS]: _________ChangeRotate");
             tempTransform2 = Body.getWorldTransform();
             tempOrientation2 = new btQuaternion(_orientation.X, _orientation.Y, _orientation.Z, _orientation.W);
             tempTransform2.setRotation(tempOrientation2);
@@ -1000,7 +1024,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                 //Body = null;
                 // TODO: dispose parts that make up body
             }
-            m_log.Debug("[PHYSICS]: _________ChangePhysics");
+            // m_log.Debug("[PHYSICS]: _________ChangePhysics");
 
             ProcessGeomCreation();
 
@@ -1092,7 +1116,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                 // TODO: dispose parts that make up body
             }
 
-            m_log.Debug("[PHYSICS]: _________ChangeSize");
+            // m_log.Debug("[PHYSICS]: _________ChangeSize");
             SetCollisionShape(null);
             // Construction of new prim
             ProcessGeomCreation();
@@ -1297,13 +1321,13 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             // TODO: throw new NotImplementedException();
             if (m_taintselected)
             {
-                Body.setCollisionFlags((int)ContactFlags.CF_NO_CONTACT_RESPONSE);
+                // Body.setCollisionFlags((int)ContactFlags.CF_NO_CONTACT_RESPONSE);
                 disableBodySoft();
 
             }
             else
             {
-                Body.setCollisionFlags(0 | (int)ContactFlags.CF_CUSTOM_MATERIAL_CALLBACK);
+                // Body.setCollisionFlags(0 | (int)ContactFlags.CF_CUSTOM_MATERIAL_CALLBACK);
                 enableBodySoft();
             }
             m_isSelected = m_taintselected;
@@ -1605,6 +1629,11 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                         enableBodySoft();
                     }
                     */
+                    if (!Body.isActive())
+                    {
+                        Body.clearForces();
+                        enableBodySoft();
+                    }
                     // 35x10 = 350n times the mass per second applied maximum.
 
                     float nmax = 35f * m_mass;
@@ -1632,6 +1661,12 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                         Body.applyCentralImpulse(tempAddForce);
                     }
                 }
+                else
+                {
+                    // if no forces on the prim, make sure everything is zero
+                    Body.clearForces();
+                    enableBodySoft();
+                }
             }
             else
             {
@@ -1985,7 +2020,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
         public void CreateGeom(IntPtr m_targetSpace, IMesh p_mesh)
         {
-            m_log.Debug("[PHYSICS]: _________CreateGeom");
+            // m_log.Debug("[PHYSICS]: _________CreateGeom");
             if (p_mesh != null)
             {
                 //_mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, _parent_scene.meshSculptLOD, IsPhysical);
@@ -2042,7 +2077,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             // TODO: Set Collision Body Mesh
             // This sleeper is there to moderate how long it takes between
             // setting up the mesh and pre-processing it when we get rapid fire mesh requests on a single object
-            m_log.Debug("_________SetMesh");
+            // m_log.Debug("_________SetMesh");
             Thread.Sleep(10);
 
             //Kill Body so that mesh can re-make the geom
@@ -2159,7 +2194,14 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
                 //     Body = new btRigidBody(mass, tempMotionState1, prim_geom);
                 //else
-                Body = new btRigidBody(mass, tempMotionState1, prim_geom, tempInertia1);
+                // Body = new btRigidBody(mass, tempMotionState1, prim_geom, tempInertia1);
+                if (Body == null)
+                {
+                    Body = new btRigidBody(mass, tempMotionState1, prim_geom, tempInertia1);
+                    // add localID so we can later map bullet object back to OpenSim object
+                    Body.setUserPointer(new IntPtr((int)m_localID));
+                }
+                
 
                 if (prim_geom is btGImpactMeshShape)
                 {
@@ -2250,7 +2292,13 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
                 //     Body = new btRigidBody(mass, tempMotionState1, prim_geom);
                 //else
-                Body = new btRigidBody(mass, tempMotionState1, prim_geom, tempInertia1);
+                // Body = new btRigidBody(mass, tempMotionState1, prim_geom, tempInertia1);
+                if (Body == null)
+                {
+                    Body = new btRigidBody(mass, tempMotionState1, prim_geom, tempInertia1);
+                    // each body has the localID stored into it so we can identify collision objects
+                    Body.setUserPointer(new IntPtr((int)m_localID));
+                }
 
                 if (prim_geom is btGImpactMeshShape)
                 {
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
index 9e048ab..85e34c1 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
@@ -47,7 +47,9 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         // private string m_sceneIdentifier = string.Empty;
         
         private List<BulletDotNETCharacter> m_characters = new List<BulletDotNETCharacter>();
+        private Dictionary<uint, BulletDotNETCharacter> m_charactersLocalID = new Dictionary<uint, BulletDotNETCharacter>();
         private List<BulletDotNETPrim> m_prims = new List<BulletDotNETPrim>();
+        private Dictionary<uint, BulletDotNETPrim> m_primsLocalID = new Dictionary<uint, BulletDotNETPrim>();
         private List<BulletDotNETPrim> m_activePrims = new List<BulletDotNETPrim>();
         private List<PhysicsActor> m_taintedActors = new List<PhysicsActor>();
         private btDiscreteDynamicsWorld m_world;
@@ -134,7 +136,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             m_dispatcher = new btCollisionDispatcher(m_collisionConfiguration);
             m_world = new btDiscreteDynamicsWorld(m_dispatcher, m_broadphase, m_solver, m_collisionConfiguration);
             m_world.setGravity(m_gravity);
-            //EnableCollisionInterface();
+            EnableCollisionInterface();
             
 
         }
@@ -145,7 +147,16 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                                                                   avCapRadius, avStandupTensor, avDensity,
                                                                   avHeightFudgeFactor, avMovementDivisorWalk,
                                                                   avMovementDivisorRun);
-            m_characters.Add(chr);
+            try
+            {
+                m_characters.Add(chr);
+                m_charactersLocalID.Add(chr.m_localID, chr);
+            }
+            catch
+            {
+                // noop if it's already there
+                m_log.Debug("[PHYSICS] BulletDotNet: adding duplicate avatar localID");
+            }
             AddPhysicsActorTaint(chr);
             return chr;
         }
@@ -154,6 +165,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         {
             BulletDotNETCharacter chr = (BulletDotNETCharacter) actor;
 
+            m_charactersLocalID.Remove(chr.m_localID);
             m_characters.Remove(chr);
             m_world.removeRigidBody(chr.Body);
             m_world.removeCollisionObject(chr.Body);
@@ -279,7 +291,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                     prim.Move(timeStep);
                 }
             }
-            float steps = m_world.stepSimulation(timeStep * 1000, 10, WorldTimeComp);
+            float steps = m_world.stepSimulation(timeStep, 10, WorldTimeComp);
 
             foreach (BulletDotNETCharacter chr in m_characters)
             {
@@ -296,20 +308,67 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             }
             if (m_CollisionInterface != null)
             {
-                List<int> collisions = m_CollisionInterface.GetContactList();
-                lock (collisions)
+                List<BulletDotNETPrim> primsWithCollisions = new List<BulletDotNETPrim>();
+                List<BulletDotNETCharacter> charactersWithCollisions = new List<BulletDotNETCharacter>();
+
+                // get the collisions that happened this tick
+                List<BulletDotNET.ContactAddedCallbackHandler.ContactInfo> collisions = m_CollisionInterface.GetContactList();
+                // passed back the localID of the prim so we can associate the prim
+                foreach (BulletDotNET.ContactAddedCallbackHandler.ContactInfo ci in collisions)
                 {
-                    foreach (int pvalue in collisions)
-                    {
-                        System.Console.Write(string.Format("{0} ", pvalue));
-                    }
+                    // ContactPoint = { contactPoint, contactNormal, penetrationDepth }
+                    ContactPoint contact = new ContactPoint(new Vector3(ci.pX, ci.pY, ci.pZ),
+                                    new Vector3(ci.nX, ci.nY, ci.nZ), ci.depth);
+                    
+                    ProcessContact(ci.contact, ci.contactWith, contact, ref primsWithCollisions, ref charactersWithCollisions);
+                    ProcessContact(ci.contactWith, ci.contact, contact, ref primsWithCollisions, ref charactersWithCollisions);
+
                 }
                 m_CollisionInterface.Clear();
-
+                // for those prims and characters that had collisions cause collision events
+                foreach (BulletDotNETPrim bdnp in primsWithCollisions)
+                {
+                    bdnp.SendCollisions();
+                }
+                foreach (BulletDotNETCharacter bdnc in charactersWithCollisions)
+                {
+                    bdnc.SendCollisions();
+                }
             }
             return steps;
         }
 
+        private void ProcessContact(uint cont, uint contWith, ContactPoint contact, 
+                    ref List<BulletDotNETPrim> primsWithCollisions,
+                    ref List<BulletDotNETCharacter> charactersWithCollisions)
+        {
+            BulletDotNETPrim bdnp;
+            // collisions with a normal prim?
+            if (m_primsLocalID.TryGetValue(cont, out bdnp))
+            {
+                // Added collision event to the prim. This creates a pile of events
+                // that will be sent to any subscribed listeners.
+                bdnp.AddCollision(contWith, contact);
+                if (!primsWithCollisions.Contains(bdnp))
+                {
+                    primsWithCollisions.Add(bdnp);
+                }
+            }
+            else
+            {
+                BulletDotNETCharacter bdnc;
+                // if not a prim, maybe it's one of the characters
+                if (m_charactersLocalID.TryGetValue(cont, out bdnc))
+                {
+                    bdnc.AddCollision(contWith, contact);
+                    if (!charactersWithCollisions.Contains(bdnc))
+                    {
+                        charactersWithCollisions.Add(bdnc);
+                    }
+                }
+            }
+        }
+
         public override void GetResults()
         {
             
@@ -387,6 +446,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             m_terrainTransform = new btTransform(QuatIdentity, m_terrainPosition);
             m_terrainMotionState = new btDefaultMotionState(m_terrainTransform);
             TerrainBody = new btRigidBody(0, m_terrainMotionState, m_terrainShape);
+            TerrainBody.setUserPointer((IntPtr)0);
             m_world.addRigidBody(TerrainBody);
 
 
@@ -459,6 +519,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         {
             lock (m_prims)
             {
+                m_primsLocalID.Clear();
                 foreach (BulletDotNETPrim prim in m_prims)
                 {
                     if (prim.Body != null)
@@ -513,6 +574,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                     m_world.removeRigidBody(body);
                 }
                 remActivePrim(prm);
+                m_primsLocalID.Remove(prm.m_localID);
                 m_prims.Remove(prm);
             }
 
@@ -686,9 +748,18 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             {
                 if (!m_prims.Contains(pPrim))
                 {
-                    m_prims.Add(pPrim);
+                    try
+                    {
+                        m_prims.Add(pPrim);
+                        m_primsLocalID.Add(pPrim.m_localID, pPrim);
+                    }
+                    catch
+                    {
+                        // noop if it's already there
+                        m_log.Debug("[PHYSICS] BulletDotNet: adding duplicate prim localID");
+                    }
                     m_world.addRigidBody(pPrim.Body);
-                    m_log.Debug("ADDED");
+                    // m_log.Debug("[PHYSICS] added prim to scene");
                 }
             }
         }
@@ -696,8 +767,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         {
             if (m_CollisionInterface == null)
             {
-                m_CollisionInterface = new ContactAddedCallbackHandler();
-                m_world.SetCollisionAddedCallback(m_CollisionInterface);
+                m_CollisionInterface = new ContactAddedCallbackHandler(m_world);
+                // m_world.SetCollisionAddedCallback(m_CollisionInterface);
             }
         }
         
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
index 2a213c3..6e9654b 100644
--- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs
+++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
@@ -1,2202 +1,2201 @@
-/*
- * Copyright (c) Contributors
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-
-namespace PrimMesher
-{
-    public struct Quat
-    {
-        /// <summary>X value</summary>
-        public float X;
-        /// <summary>Y value</summary>
-        public float Y;
-        /// <summary>Z value</summary>
-        public float Z;
-        /// <summary>W value</summary>
-        public float W;
-
-        public Quat(float x, float y, float z, float w)
-        {
-            X = x;
-            Y = y;
-            Z = z;
-            W = w;
-        }
-
-        public Quat(Coord axis, float angle)
-        {
-            axis = axis.Normalize();
-
-            angle *= 0.5f;
-            float c = (float)Math.Cos(angle);
-            float s = (float)Math.Sin(angle);
-
-            X = axis.X * s;
-            Y = axis.Y * s;
-            Z = axis.Z * s;
-            W = c;
-
-            Normalize();
-        }
-
-        public float Length()
-        {
-            return (float)Math.Sqrt(X * X + Y * Y + Z * Z + W * W);
-        }
-
-        public Quat Normalize()
-        {
-            const float MAG_THRESHOLD = 0.0000001f;
-            float mag = Length();
-
-            // Catch very small rounding errors when normalizing
-            if (mag > MAG_THRESHOLD)
-            {
-                float oomag = 1f / mag;
-                X *= oomag;
-                Y *= oomag;
-                Z *= oomag;
-                W *= oomag;
-            }
-            else
-            {
-                X = 0f;
-                Y = 0f;
-                Z = 0f;
-                W = 1f;
-            }
-
-            return this;
-        }
-
-        public static Quat operator *(Quat q1, Quat q2)
-        {
-            float x = q1.W * q2.X + q1.X * q2.W + q1.Y * q2.Z - q1.Z * q2.Y;
-            float y = q1.W * q2.Y - q1.X * q2.Z + q1.Y * q2.W + q1.Z * q2.X;
-            float z = q1.W * q2.Z + q1.X * q2.Y - q1.Y * q2.X + q1.Z * q2.W;
-            float w = q1.W * q2.W - q1.X * q2.X - q1.Y * q2.Y - q1.Z * q2.Z;
-            return new Quat(x, y, z, w);
-        }
-
-        public override string ToString()
-        {
-            return "< X: " + this.X.ToString() + ", Y: " + this.Y.ToString() + ", Z: " + this.Z.ToString() + ", W: " + this.W.ToString() + ">";
-        }
-    }
-
-    public struct Coord
-    {
-        public float X;
-        public float Y;
-        public float Z;
-
-        public Coord(float x, float y, float z)
-        {
-            this.X = x;
-            this.Y = y;
-            this.Z = z;
-        }
-
-        public float Length()
-        {
-            return (float)Math.Sqrt(this.X * this.X + this.Y * this.Y + this.Z * this.Z);
-        }
-
-        public Coord Invert()
-        {
-            this.X = -this.X;
-            this.Y = -this.Y;
-            this.Z = -this.Z;
-
-            return this;
-        }
-
-        public Coord Normalize()
-        {
-            const float MAG_THRESHOLD = 0.0000001f;
-            float mag = Length();
-
-            // Catch very small rounding errors when normalizing
-            if (mag > MAG_THRESHOLD)
-            {
-                float oomag = 1.0f / mag;
-                this.X *= oomag;
-                this.Y *= oomag;
-                this.Z *= oomag;
-            }
-            else
-            {
-                this.X = 0.0f;
-                this.Y = 0.0f;
-                this.Z = 0.0f;
-            }
-
-            return this;
-        }
-
-        public override string ToString()
-        {
-            return this.X.ToString() + " " + this.Y.ToString() + " " + this.Z.ToString();
-        }
-
-        public static Coord Cross(Coord c1, Coord c2)
-        {
-            return new Coord(
-                c1.Y * c2.Z - c2.Y * c1.Z,
-                c1.Z * c2.X - c2.Z * c1.X,
-                c1.X * c2.Y - c2.X * c1.Y
-                );
-        }
-
-        public static Coord operator +(Coord v, Coord a)
-        {
-            return new Coord(v.X + a.X, v.Y + a.Y, v.Z + a.Z);
-        }
-
-        public static Coord operator *(Coord v, Coord m)
-        {
-            return new Coord(v.X * m.X, v.Y * m.Y, v.Z * m.Z);
-        }
-
-        public static Coord operator *(Coord v, Quat q)
-        {
-            // From http://www.euclideanspace.com/maths/algebra/realNormedAlgebra/quaternions/transforms/
-
-            Coord c2 = new Coord(0.0f, 0.0f, 0.0f);
-
-            c2.X = q.W * q.W * v.X +
-                2f * q.Y * q.W * v.Z -
-                2f * q.Z * q.W * v.Y +
-                     q.X * q.X * v.X +
-                2f * q.Y * q.X * v.Y +
-                2f * q.Z * q.X * v.Z -
-                     q.Z * q.Z * v.X -
-                     q.Y * q.Y * v.X;
-
-            c2.Y =
-                2f * q.X * q.Y * v.X +
-                     q.Y * q.Y * v.Y +
-                2f * q.Z * q.Y * v.Z +
-                2f * q.W * q.Z * v.X -
-                     q.Z * q.Z * v.Y +
-                     q.W * q.W * v.Y -
-                2f * q.X * q.W * v.Z -
-                     q.X * q.X * v.Y;
-
-            c2.Z =
-                2f * q.X * q.Z * v.X +
-                2f * q.Y * q.Z * v.Y +
-                     q.Z * q.Z * v.Z -
-                2f * q.W * q.Y * v.X -
-                     q.Y * q.Y * v.Z +
-                2f * q.W * q.X * v.Y -
-                     q.X * q.X * v.Z +
-                     q.W * q.W * v.Z;
-
-            return c2;
-        }
-    }
-
-    public struct UVCoord
-    {
-        public float U;
-        public float V;
-
-
-        public UVCoord(float u, float v)
-        {
-            this.U = u;
-            this.V = v;
-        }
-    }
-
-    public struct Face
-    {
-        public int primFace;
-
-        // vertices
-        public int v1;
-        public int v2;
-        public int v3;
-
-        //normals
-        public int n1;
-        public int n2;
-        public int n3;
-
-        // uvs
-        public int uv1;
-        public int uv2;
-        public int uv3;
-
-
-        public Face(int v1, int v2, int v3)
-        {
-            primFace = 0;
-
-            this.v1 = v1;
-            this.v2 = v2;
-            this.v3 = v3;
-
-            this.n1 = 0;
-            this.n2 = 0;
-            this.n3 = 0;
-
-            this.uv1 = 0;
-            this.uv2 = 0;
-            this.uv3 = 0;
-
-        }
-
-        public Face(int v1, int v2, int v3, int n1, int n2, int n3)
-        {
-            primFace = 0;
-
-            this.v1 = v1;
-            this.v2 = v2;
-            this.v3 = v3;
-
-            this.n1 = n1;
-            this.n2 = n2;
-            this.n3 = n3;
-
-            this.uv1 = 0;
-            this.uv2 = 0;
-            this.uv3 = 0;
-        }
-
-        public Coord SurfaceNormal(List<Coord> coordList)
-        {
-            Coord c1 = coordList[this.v1];
-            Coord c2 = coordList[this.v2];
-            Coord c3 = coordList[this.v3];
-
-            Coord edge1 = new Coord(c2.X - c1.X, c2.Y - c1.Y, c2.Z - c1.Z);
-            Coord edge2 = new Coord(c3.X - c1.X, c3.Y - c1.Y, c3.Z - c1.Z);
-
-            return Coord.Cross(edge1, edge2).Normalize();
-        }
-    }
-
-    public struct ViewerFace
-    {
-        public int primFaceNumber;
-
-        public Coord v1;
-        public Coord v2;
-        public Coord v3;
-
-        public int coordIndex1;
-        public int coordIndex2;
-        public int coordIndex3;
-
-        public Coord n1;
-        public Coord n2;
-        public Coord n3;
-
-        public UVCoord uv1;
-        public UVCoord uv2;
-        public UVCoord uv3;
-
-        public ViewerFace(int primFaceNumber)
-        {
-            this.primFaceNumber = primFaceNumber;
-
-            this.v1 = new Coord();
-            this.v2 = new Coord();
-            this.v3 = new Coord();
-
-            this.coordIndex1 = this.coordIndex2 = this.coordIndex3 = -1; // -1 means not assigned yet
-
-            this.n1 = new Coord();
-            this.n2 = new Coord();
-            this.n3 = new Coord();
-
-            this.uv1 = new UVCoord();
-            this.uv2 = new UVCoord();
-            this.uv3 = new UVCoord();
-        }
-
-        public void Scale(float x, float y, float z)
-        {
-            this.v1.X *= x;
-            this.v1.Y *= y;
-            this.v1.Z *= z;
-
-            this.v2.X *= x;
-            this.v2.Y *= y;
-            this.v2.Z *= z;
-
-            this.v3.X *= x;
-            this.v3.Y *= y;
-            this.v3.Z *= z;
-        }
-
-        public void AddPos(float x, float y, float z)
-        {
-            this.v1.X += x;
-            this.v2.X += x;
-            this.v3.X += x;
-
-            this.v1.Y += y;
-            this.v2.Y += y;
-            this.v3.Y += y;
-
-            this.v1.Z += z;
-            this.v2.Z += z;
-            this.v3.Z += z;
-        }
-
-        public void AddRot(Quat q)
-        {
-            this.v1 *= q;
-            this.v2 *= q;
-            this.v3 *= q;
-
-            this.n1 *= q;
-            this.n2 *= q;
-            this.n3 *= q;
-        }
-
-        public void CalcSurfaceNormal()
-        {
-
-            Coord edge1 = new Coord(this.v2.X - this.v1.X, this.v2.Y - this.v1.Y, this.v2.Z - this.v1.Z);
-            Coord edge2 = new Coord(this.v3.X - this.v1.X, this.v3.Y - this.v1.Y, this.v3.Z - this.v1.Z);
-
-            this.n1 = this.n2 = this.n3 = Coord.Cross(edge1, edge2).Normalize();
-        }
-    }
-
-    internal struct Angle
-    {
-        internal float angle;
-        internal float X;
-        internal float Y;
-
-        internal Angle(float angle, float x, float y)
-        {
-            this.angle = angle;
-            this.X = x;
-            this.Y = y;
-        }
-    }
-
-    internal class AngleList
-    {
-        private float iX, iY; // intersection point
-
-        private static Angle[] angles3 =
-        {
-            new Angle(0.0f, 1.0f, 0.0f),
-            new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f),
-            new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f),
-            new Angle(1.0f, 1.0f, 0.0f)
-        };
-
-        private static Coord[] normals3 =
-        {
-            new Coord(0.25f, 0.4330127019f, 0.0f).Normalize(),
-            new Coord(-0.5f, 0.0f, 0.0f).Normalize(),
-            new Coord(0.25f, -0.4330127019f, 0.0f).Normalize(),
-            new Coord(0.25f, 0.4330127019f, 0.0f).Normalize()
-        };
-
-        private static Angle[] angles4 =
-        {
-            new Angle(0.0f, 1.0f, 0.0f),
-            new Angle(0.25f, 0.0f, 1.0f),
-            new Angle(0.5f, -1.0f, 0.0f),
-            new Angle(0.75f, 0.0f, -1.0f),
-            new Angle(1.0f, 1.0f, 0.0f)
-        };
-
-        private static Coord[] normals4 = 
-        {
-            new Coord(0.5f, 0.5f, 0.0f).Normalize(),
-            new Coord(-0.5f, 0.5f, 0.0f).Normalize(),
-            new Coord(-0.5f, -0.5f, 0.0f).Normalize(),
-            new Coord(0.5f, -0.5f, 0.0f).Normalize(),
-            new Coord(0.5f, 0.5f, 0.0f).Normalize()
-        };
-
-        private static Angle[] angles24 =
-        {
-            new Angle(0.0f, 1.0f, 0.0f),
-            new Angle(0.041666666666666664f, 0.96592582628906831f, 0.25881904510252074f),
-            new Angle(0.083333333333333329f, 0.86602540378443871f, 0.5f),
-            new Angle(0.125f, 0.70710678118654757f, 0.70710678118654746f),
-            new Angle(0.16666666666666667f, 0.5f, 0.8660254037844386f),
-            new Angle(0.20833333333333331f, 0.25881904510252096f, 0.9659258262890682f),
-            new Angle(0.25f, 0.0f, 1.0f),
-            new Angle(0.29166666666666663f, -0.25881904510252063f, 0.96592582628906831f),
-            new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f),
-            new Angle(0.375f, -0.70710678118654746f, 0.70710678118654757f),
-            new Angle(0.41666666666666663f, -0.86602540378443849f, 0.5f),
-            new Angle(0.45833333333333331f, -0.9659258262890682f, 0.25881904510252102f),
-            new Angle(0.5f, -1.0f, 0.0f),
-            new Angle(0.54166666666666663f, -0.96592582628906842f, -0.25881904510252035f),
-            new Angle(0.58333333333333326f, -0.86602540378443882f, -0.5f),
-            new Angle(0.62499999999999989f, -0.70710678118654791f, -0.70710678118654713f),
-            new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f),
-            new Angle(0.70833333333333326f, -0.25881904510252152f, -0.96592582628906809f),
-            new Angle(0.75f, 0.0f, -1.0f),
-            new Angle(0.79166666666666663f, 0.2588190451025203f, -0.96592582628906842f),
-            new Angle(0.83333333333333326f, 0.5f, -0.86602540378443904f),
-            new Angle(0.875f, 0.70710678118654735f, -0.70710678118654768f),
-            new Angle(0.91666666666666663f, 0.86602540378443837f, -0.5f),
-            new Angle(0.95833333333333326f, 0.96592582628906809f, -0.25881904510252157f),
-            new Angle(1.0f, 1.0f, 0.0f)
-        };
-
-        private Angle interpolatePoints(float newPoint, Angle p1, Angle p2)
-        {
-            float m = (newPoint - p1.angle) / (p2.angle - p1.angle);
-            return new Angle(newPoint, p1.X + m * (p2.X - p1.X), p1.Y + m * (p2.Y - p1.Y));
-        }
-
-        private void intersection(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4)
-        { // ref: http://local.wasp.uwa.edu.au/~pbourke/geometry/lineline2d/
-            double denom = (y4 - y3) * (x2 - x1) - (x4 - x3) * (y2 - y1);
-            double uaNumerator = (x4 - x3) * (y1 - y3) - (y4 - y3) * (x1 - x3);
-
-            if (denom != 0.0)
-            {
-                double ua = uaNumerator / denom;
-                iX = (float)(x1 + ua * (x2 - x1));
-                iY = (float)(y1 + ua * (y2 - y1));
-            }
-        }
-
-        internal List<Angle> angles;
-        internal List<Coord> normals;
-
-        internal void makeAngles(int sides, float startAngle, float stopAngle)
-        {
-            angles = new List<Angle>();
-            normals = new List<Coord>();
-
-            double twoPi = System.Math.PI * 2.0;
-            float twoPiInv = 1.0f / (float)twoPi;
-
-            if (sides < 1)
-                throw new Exception("number of sides not greater than zero");
-            if (stopAngle <= startAngle)
-                throw new Exception("stopAngle not greater than startAngle");
-
-            if ((sides == 3 || sides == 4 || sides == 24))
-            {
-                startAngle *= twoPiInv;
-                stopAngle *= twoPiInv;
-
-                Angle[] sourceAngles;
-                if (sides == 3)
-                    sourceAngles = angles3;
-                else if (sides == 4)
-                    sourceAngles = angles4;
-                else sourceAngles = angles24;
-
-                int startAngleIndex = (int)(startAngle * sides);
-                int endAngleIndex = sourceAngles.Length - 1;
-                if (stopAngle < 1.0f)
-                    endAngleIndex = (int)(stopAngle * sides) + 1;
-                if (endAngleIndex == startAngleIndex)
-                    endAngleIndex++;
-
-                for (int angleIndex = startAngleIndex; angleIndex < endAngleIndex + 1; angleIndex++)
-                {
-                    angles.Add(sourceAngles[angleIndex]);
-                    if (sides == 3)
-                        normals.Add(normals3[angleIndex]);
-                    else if (sides == 4)
-                        normals.Add(normals4[angleIndex]);
-                }
-
-                if (startAngle > 0.0f)
-                    angles[0] = interpolatePoints(startAngle, angles[0], angles[1]);
-
-                if (stopAngle < 1.0f)
-                {
-                    int lastAngleIndex = angles.Count - 1;
-                    angles[lastAngleIndex] = interpolatePoints(stopAngle, angles[lastAngleIndex - 1], angles[lastAngleIndex]);
-                }
-            }
-            else
-            {
-                double stepSize = twoPi / sides;
-
-                int startStep = (int)(startAngle / stepSize);
-                double angle = stepSize * startStep;
-                int step = startStep;
-                double stopAngleTest = stopAngle;
-                if (stopAngle < twoPi)
-                {
-                    stopAngleTest = stepSize * ((int)(stopAngle / stepSize) + 1);
-                    if (stopAngleTest < stopAngle)
-                        stopAngleTest += stepSize;
-                    if (stopAngleTest > twoPi)
-                        stopAngleTest = twoPi;
-                }
-
-                while (angle <= stopAngleTest)
-                {
-                    Angle newAngle;
-                    newAngle.angle = (float)angle;
-                    newAngle.X = (float)System.Math.Cos(angle);
-                    newAngle.Y = (float)System.Math.Sin(angle);
-                    angles.Add(newAngle);
-                    step += 1;
-                    angle = stepSize * step;
-                }
-
-                if (startAngle > angles[0].angle)
-                {
-                    Angle newAngle;
-                    intersection(angles[0].X, angles[0].Y, angles[1].X, angles[1].Y, 0.0f, 0.0f, (float)Math.Cos(startAngle), (float)Math.Sin(startAngle));
-                    newAngle.angle = startAngle;
-                    newAngle.X = iX;
-                    newAngle.Y = iY;
-                    angles[0] = newAngle;
-                }
-
-                int index = angles.Count - 1;
-                if (stopAngle < angles[index].angle)
-                {
-                    Angle newAngle;
-                    intersection(angles[index - 1].X, angles[index - 1].Y, angles[index].X, angles[index].Y, 0.0f, 0.0f, (float)Math.Cos(stopAngle), (float)Math.Sin(stopAngle));
-                    newAngle.angle = stopAngle;
-                    newAngle.X = iX;
-                    newAngle.Y = iY;
-                    angles[index] = newAngle;
-                }
-            }
-        }
-    }
-
-    /// <summary>
-    /// generates a profile for extrusion
-    /// </summary>
-    internal class Profile
-    {
-        private const float twoPi = 2.0f * (float)Math.PI;
-
-        internal string errorMessage = null;
-
-        internal List<Coord> coords;
-        internal List<Face> faces;
-        internal List<Coord> vertexNormals;
-        internal List<float> us;
-        internal List<UVCoord> faceUVs;
-        internal List<int> faceNumbers;
-
-        // use these for making individual meshes for each prim face
-        internal List<int> outerCoordIndices = null;
-        internal List<int> hollowCoordIndices = null;
-        internal List<int> cut1CoordIndices = null;
-        internal List<int> cut2CoordIndices = null;
-
-        internal Coord faceNormal = new Coord(0.0f, 0.0f, 1.0f);
-        internal Coord cutNormal1 = new Coord();
-        internal Coord cutNormal2 = new Coord();
-
-        internal int numOuterVerts = 0;
-        internal int numHollowVerts = 0;
-
-        internal bool calcVertexNormals = false;
-        internal int bottomFaceNumber = 0;
-        internal int numPrimFaces = 0;
-
-        internal Profile()
-        {
-            this.coords = new List<Coord>();
-            this.faces = new List<Face>();
-            this.vertexNormals = new List<Coord>();
-            this.us = new List<float>();
-            this.faceUVs = new List<UVCoord>();
-            this.faceNumbers = new List<int>();
-        }
-
-        internal Profile(int sides, float profileStart, float profileEnd, float hollow, int hollowSides, bool createFaces, bool calcVertexNormals)
-        {
-            this.calcVertexNormals = calcVertexNormals;
-            this.coords = new List<Coord>();
-            this.faces = new List<Face>();
-            this.vertexNormals = new List<Coord>();
-            this.us = new List<float>();
-            this.faceUVs = new List<UVCoord>();
-            this.faceNumbers = new List<int>();
-
-            Coord center = new Coord(0.0f, 0.0f, 0.0f);
-            //bool hasCenter = false;
-
-            List<Coord> hollowCoords = new List<Coord>();
-            List<Coord> hollowNormals = new List<Coord>();
-            List<float> hollowUs = new List<float>();
-
-            if (calcVertexNormals)
-            {
-                this.outerCoordIndices = new List<int>();
-                this.hollowCoordIndices = new List<int>();
-                this.cut1CoordIndices = new List<int>();
-                this.cut2CoordIndices = new List<int>();
-            }
-
-            bool hasHollow = (hollow > 0.0f);
-
-            bool hasProfileCut = (profileStart > 0.0f || profileEnd < 1.0f);
-
-            AngleList angles = new AngleList();
-            AngleList hollowAngles = new AngleList();
-
-            float xScale = 0.5f;
-            float yScale = 0.5f;
-            if (sides == 4)  // corners of a square are sqrt(2) from center
-            {
-                xScale = 0.707f;
-                yScale = 0.707f;
-            }
-
-            float startAngle = profileStart * twoPi;
-            float stopAngle = profileEnd * twoPi;
-
-            try { angles.makeAngles(sides, startAngle, stopAngle); }
-            catch (Exception ex)
-            {
-
-                errorMessage = "makeAngles failed: Exception: " + ex.ToString()
-                + "\nsides: " + sides.ToString() + " startAngle: " + startAngle.ToString() + " stopAngle: " + stopAngle.ToString();
-
-                return;
-            }
-
-            this.numOuterVerts = angles.angles.Count;
-
-            // flag to create as few triangles as possible for 3 or 4 side profile
-            bool simpleFace = (sides < 5 && !hasHollow && !hasProfileCut);
-
-            if (hasHollow)
-            {
-                if (sides == hollowSides)
-                    hollowAngles = angles;
-                else
-                {
-                    try { hollowAngles.makeAngles(hollowSides, startAngle, stopAngle); }
-                    catch (Exception ex)
-                    {
-                        errorMessage = "makeAngles failed: Exception: " + ex.ToString()
-                        + "\nsides: " + sides.ToString() + " startAngle: " + startAngle.ToString() + " stopAngle: " + stopAngle.ToString();
-
-                        return;
-                    }
-                }
-                this.numHollowVerts = hollowAngles.angles.Count;
-            }
-            else if (!simpleFace)
-            {
-                this.coords.Add(center);
-                //hasCenter = true;
-                if (this.calcVertexNormals)
-                    this.vertexNormals.Add(new Coord(0.0f, 0.0f, 1.0f));
-                this.us.Add(0.0f);
-            }
-
-            float z = 0.0f;
-
-            Angle angle;
-            Coord newVert = new Coord();
-            if (hasHollow && hollowSides != sides)
-            {
-                int numHollowAngles = hollowAngles.angles.Count;
-                for (int i = 0; i < numHollowAngles; i++)
-                {
-                    angle = hollowAngles.angles[i];
-                    newVert.X = hollow * xScale * angle.X;
-                    newVert.Y = hollow * yScale * angle.Y;
-                    newVert.Z = z;
-
-                    hollowCoords.Add(newVert);
-                    if (this.calcVertexNormals)
-                    {
-                        if (hollowSides < 5)
-                            hollowNormals.Add(hollowAngles.normals[i].Invert());
-                        else
-                            hollowNormals.Add(new Coord(-angle.X, -angle.Y, 0.0f));
-
-                        hollowUs.Add(angle.angle * hollow);
-                    }
-                }
-            }
-
-            int index = 0;
-            int numAngles = angles.angles.Count;
-
-            for (int i = 0; i < numAngles; i++)
-            {
-                angle = angles.angles[i];
-                newVert.X = angle.X * xScale;
-                newVert.Y = angle.Y * yScale;
-                newVert.Z = z;
-                this.coords.Add(newVert);
-                if (this.calcVertexNormals)
-                {
-                    this.outerCoordIndices.Add(this.coords.Count - 1);
-
-                    if (sides < 5)
-                    {
-                        this.vertexNormals.Add(angles.normals[i]);
-                        float u = angle.angle;
-                        this.us.Add(u);
-                    }
-                    else
-                    {
-                        this.vertexNormals.Add(new Coord(angle.X, angle.Y, 0.0f));
-                        this.us.Add(angle.angle);
-                    }
-                }
-
-                if (hasHollow)
-                {
-                    if (hollowSides == sides)
-                    {
-                        newVert.X *= hollow;
-                        newVert.Y *= hollow;
-                        newVert.Z = z;
-                        hollowCoords.Add(newVert);
-                        if (this.calcVertexNormals)
-                        {
-                            if (sides < 5)
-                            {
-                                hollowNormals.Add(angles.normals[i].Invert());
-                            }
-
-                            else
-                                hollowNormals.Add(new Coord(-angle.X, -angle.Y, 0.0f));
-
-                            hollowUs.Add(angle.angle * hollow);
-                        }
-                    }
-                }
-                else if (!simpleFace && createFaces && angle.angle > 0.0001f)
-                {
-                    Face newFace = new Face();
-                    newFace.v1 = 0;
-                    newFace.v2 = index;
-                    newFace.v3 = index + 1;
-
-                    this.faces.Add(newFace);
-                }
-                index += 1;
-            }
-
-            if (hasHollow)
-            {
-                hollowCoords.Reverse();
-                if (this.calcVertexNormals)
-                {
-                    hollowNormals.Reverse();
-                    hollowUs.Reverse();
-                }
-
-                if (createFaces)
-                {
-                    int numOuterVerts = this.coords.Count;
-                    int numHollowVerts = hollowCoords.Count;
-                    int numTotalVerts = numOuterVerts + numHollowVerts;
-
-                    if (numOuterVerts == numHollowVerts)
-                    {
-                        Face newFace = new Face();
-
-                        for (int coordIndex = 0; coordIndex < numOuterVerts - 1; coordIndex++)
-                        {
-                            newFace.v1 = coordIndex;
-                            newFace.v2 = coordIndex + 1;
-                            newFace.v3 = numTotalVerts - coordIndex - 1;
-                            this.faces.Add(newFace);
-
-                            newFace.v1 = coordIndex + 1;
-                            newFace.v2 = numTotalVerts - coordIndex - 2;
-                            newFace.v3 = numTotalVerts - coordIndex - 1;
-                            this.faces.Add(newFace);
-                        }
-                    }
-                    else
-                    {
-                        if (numOuterVerts < numHollowVerts)
-                        {
-                            Face newFace = new Face();
-                            int j = 0; // j is the index for outer vertices
-                            int maxJ = numOuterVerts - 1;
-                            for (int i = 0; i < numHollowVerts; i++) // i is the index for inner vertices
-                            {
-                                if (j < maxJ)
-                                    if (angles.angles[j + 1].angle - hollowAngles.angles[i].angle < hollowAngles.angles[i].angle - angles.angles[j].angle + 0.000001f)
-                                    {
-                                        newFace.v1 = numTotalVerts - i - 1;
-                                        newFace.v2 = j;
-                                        newFace.v3 = j + 1;
-
-                                        this.faces.Add(newFace);
-                                        j += 1;
-                                    }
-
-                                newFace.v1 = j;
-                                newFace.v2 = numTotalVerts - i - 2;
-                                newFace.v3 = numTotalVerts - i - 1;
-
-                                this.faces.Add(newFace);
-                            }
-                        }
-                        else // numHollowVerts < numOuterVerts
-                        {
-                            Face newFace = new Face();
-                            int j = 0; // j is the index for inner vertices
-                            int maxJ = numHollowVerts - 1;
-                            for (int i = 0; i < numOuterVerts; i++)
-                            {
-                                if (j < maxJ)
-                                    if (hollowAngles.angles[j + 1].angle - angles.angles[i].angle < angles.angles[i].angle - hollowAngles.angles[j].angle + 0.000001f)
-                                    {
-                                        newFace.v1 = i;
-                                        newFace.v2 = numTotalVerts - j - 2;
-                                        newFace.v3 = numTotalVerts - j - 1;
-
-                                        this.faces.Add(newFace);
-                                        j += 1;
-                                    }
-
-                                newFace.v1 = numTotalVerts - j - 1;
-                                newFace.v2 = i;
-                                newFace.v3 = i + 1;
-
-                                this.faces.Add(newFace);
-                            }
-                        }
-                    }
-                }
-
-                if (calcVertexNormals)
-                {
-                    foreach (Coord hc in hollowCoords)
-                    {
-                        this.coords.Add(hc);
-                        hollowCoordIndices.Add(this.coords.Count - 1);
-                    }
-                }
-                else
-                    this.coords.AddRange(hollowCoords);
-
-                if (this.calcVertexNormals)
-                {
-                    this.vertexNormals.AddRange(hollowNormals);
-                    this.us.AddRange(hollowUs);
-
-                }
-            }
-
-            if (simpleFace && createFaces)
-            {
-                if (sides == 3)
-                    this.faces.Add(new Face(0, 1, 2));
-                else if (sides == 4)
-                {
-                    this.faces.Add(new Face(0, 1, 2));
-                    this.faces.Add(new Face(0, 2, 3));
-                }
-            }
-
-            if (calcVertexNormals && hasProfileCut)
-            {
-                if (hasHollow)
-                {
-                    int lastOuterVertIndex = this.numOuterVerts - 1;
-
-                    this.cut1CoordIndices.Add(0);
-                    this.cut1CoordIndices.Add(this.coords.Count - 1);
-
-                    this.cut2CoordIndices.Add(lastOuterVertIndex + 1);
-                    this.cut2CoordIndices.Add(lastOuterVertIndex);
-
-                    this.cutNormal1.X = this.coords[0].Y - this.coords[this.coords.Count - 1].Y;
-                    this.cutNormal1.Y = -(this.coords[0].X - this.coords[this.coords.Count - 1].X);
-
-                    this.cutNormal2.X = this.coords[lastOuterVertIndex + 1].Y - this.coords[lastOuterVertIndex].Y;
-                    this.cutNormal2.Y = -(this.coords[lastOuterVertIndex + 1].X - this.coords[lastOuterVertIndex].X);
-                }
-
-                else
-                {
-                    this.cutNormal1.X = this.vertexNormals[1].Y;
-                    this.cutNormal1.Y = -this.vertexNormals[1].X;
-
-                    this.cutNormal2.X = -this.vertexNormals[this.vertexNormals.Count - 2].Y;
-                    this.cutNormal2.Y = this.vertexNormals[this.vertexNormals.Count - 2].X;
-
-                }
-                this.cutNormal1.Normalize();
-                this.cutNormal2.Normalize();
-            }
-
-            this.MakeFaceUVs();
-
-            hollowCoords = null;
-            hollowNormals = null;
-            hollowUs = null;
-
-            if (calcVertexNormals)
-            { // calculate prim face numbers
-
-                // face number order is top, outer, hollow, bottom, start cut, end cut
-                // I know it's ugly but so is the whole concept of prim face numbers
-
-                int faceNum = 1; // start with outer faces
-                int startVert = hasProfileCut && !hasHollow ? 1 : 0;
-                if (startVert > 0)
-                    this.faceNumbers.Add(-1);
-                for (int i = 0; i < numOuterVerts - 1; i++)
-                    this.faceNumbers.Add(sides < 5 ? faceNum++ : faceNum);
-
-                //if (!hasHollow && !hasProfileCut)
-                //    this.bottomFaceNumber = faceNum++;
-
-                this.faceNumbers.Add(hasProfileCut ? -1 : faceNum++);
-
-                if (sides > 4 && (hasHollow || hasProfileCut))
-                    faceNum++;
-
-                if (hasHollow)
-                {
-                    for (int i = 0; i < numHollowVerts; i++)
-                        this.faceNumbers.Add(faceNum);
-
-                    faceNum++;
-                }
-                //if (hasProfileCut || hasHollow)
-                //    this.bottomFaceNumber = faceNum++;
-                this.bottomFaceNumber = faceNum++;
-
-                if (hasHollow && hasProfileCut)
-                    this.faceNumbers.Add(faceNum++);
-                for (int i = 0; i < this.faceNumbers.Count; i++)
-                    if (this.faceNumbers[i] == -1)
-                        this.faceNumbers[i] = faceNum++;
-
-
-                this.numPrimFaces = faceNum;
-            }
-
-        }
-
-        internal void MakeFaceUVs()
-        {
-            this.faceUVs = new List<UVCoord>();
-            foreach (Coord c in this.coords)
-                this.faceUVs.Add(new UVCoord(1.0f - (0.5f + c.X), 1.0f - (0.5f - c.Y)));
-        }
-
-        internal Profile Copy()
-        {
-            return this.Copy(true);
-        }
-
-        internal Profile Copy(bool needFaces)
-        {
-            Profile copy = new Profile();
-
-            copy.coords.AddRange(this.coords);
-            copy.faceUVs.AddRange(this.faceUVs);
-
-            if (needFaces)
-                copy.faces.AddRange(this.faces);
-            if ((copy.calcVertexNormals = this.calcVertexNormals) == true)
-            {
-                copy.vertexNormals.AddRange(this.vertexNormals);
-                copy.faceNormal = this.faceNormal;
-                copy.cutNormal1 = this.cutNormal1;
-                copy.cutNormal2 = this.cutNormal2;
-                copy.us.AddRange(this.us);
-                copy.faceNumbers.AddRange(this.faceNumbers);
-
-                copy.cut1CoordIndices = new List<int>(this.cut1CoordIndices);
-                copy.cut2CoordIndices = new List<int>(this.cut2CoordIndices);
-                copy.hollowCoordIndices = new List<int>(this.hollowCoordIndices);
-                copy.outerCoordIndices = new List<int>(this.outerCoordIndices);
-            }
-            copy.numOuterVerts = this.numOuterVerts;
-            copy.numHollowVerts = this.numHollowVerts;
-
-            return copy;
-        }
-
-        internal void AddPos(Coord v)
-        {
-            this.AddPos(v.X, v.Y, v.Z);
-        }
-
-        internal void AddPos(float x, float y, float z)
-        {
-            int i;
-            int numVerts = this.coords.Count;
-            Coord vert;
-
-            for (i = 0; i < numVerts; i++)
-            {
-                vert = this.coords[i];
-                vert.X += x;
-                vert.Y += y;
-                vert.Z += z;
-                this.coords[i] = vert;
-            }
-        }
-
-        internal void AddRot(Quat q)
-        {
-            int i;
-            int numVerts = this.coords.Count;
-
-            for (i = 0; i < numVerts; i++)
-                this.coords[i] *= q;
-
-            if (this.calcVertexNormals)
-            {
-                int numNormals = this.vertexNormals.Count;
-                for (i = 0; i < numNormals; i++)
-                    this.vertexNormals[i] *= q;
-
-                this.faceNormal *= q;
-                this.cutNormal1 *= q;
-                this.cutNormal2 *= q;
-
-            }
-        }
-
-        internal void Scale(float x, float y)
-        {
-            int i;
-            int numVerts = this.coords.Count;
-            Coord vert;
-
-            for (i = 0; i < numVerts; i++)
-            {
-                vert = this.coords[i];
-                vert.X *= x;
-                vert.Y *= y;
-                this.coords[i] = vert;
-            }
-        }
-
-        /// <summary>
-        /// Changes order of the vertex indices and negates the center vertex normal. Does not alter vertex normals of radial vertices
-        /// </summary>
-        internal void FlipNormals()
-        {
-            int i;
-            int numFaces = this.faces.Count;
-            Face tmpFace;
-            int tmp;
-
-            for (i = 0; i < numFaces; i++)
-            {
-                tmpFace = this.faces[i];
-                tmp = tmpFace.v3;
-                tmpFace.v3 = tmpFace.v1;
-                tmpFace.v1 = tmp;
-                this.faces[i] = tmpFace;
-            }
-
-            if (this.calcVertexNormals)
-            {
-                int normalCount = this.vertexNormals.Count;
-                if (normalCount > 0)
-                {
-                    Coord n = this.vertexNormals[normalCount - 1];
-                    n.Z = -n.Z;
-                    this.vertexNormals[normalCount - 1] = n;
-                }
-            }
-
-            this.faceNormal.X = -this.faceNormal.X;
-            this.faceNormal.Y = -this.faceNormal.Y;
-            this.faceNormal.Z = -this.faceNormal.Z;
-
-            int numfaceUVs = this.faceUVs.Count;
-            for (i = 0; i < numfaceUVs; i++)
-            {
-                UVCoord uv = this.faceUVs[i];
-                uv.V = 1.0f - uv.V;
-                this.faceUVs[i] = uv;
-            }
-        }
-
-        internal void AddValue2FaceVertexIndices(int num)
-        {
-            int numFaces = this.faces.Count;
-            Face tmpFace;
-            for (int i = 0; i < numFaces; i++)
-            {
-                tmpFace = this.faces[i];
-                tmpFace.v1 += num;
-                tmpFace.v2 += num;
-                tmpFace.v3 += num;
-
-                this.faces[i] = tmpFace;
-            }
-        }
-
-        internal void AddValue2FaceNormalIndices(int num)
-        {
-            if (this.calcVertexNormals)
-            {
-                int numFaces = this.faces.Count;
-                Face tmpFace;
-                for (int i = 0; i < numFaces; i++)
-                {
-                    tmpFace = this.faces[i];
-                    tmpFace.n1 += num;
-                    tmpFace.n2 += num;
-                    tmpFace.n3 += num;
-
-                    this.faces[i] = tmpFace;
-                }
-            }
-        }
-
-        internal void DumpRaw(String path, String name, String title)
-        {
-            if (path == null)
-                return;
-            String fileName = name + "_" + title + ".raw";
-            String completePath = System.IO.Path.Combine(path, fileName);
-            StreamWriter sw = new StreamWriter(completePath);
-
-            for (int i = 0; i < this.faces.Count; i++)
-            {
-                string s = this.coords[this.faces[i].v1].ToString();
-                s += " " + this.coords[this.faces[i].v2].ToString();
-                s += " " + this.coords[this.faces[i].v3].ToString();
-
-                sw.WriteLine(s);
-            }
-
-            sw.Close();
-        }
-    }
-
-    public struct PathNode
-    {
-        public Coord position;
-        public Quat rotation;
-        public float xScale;
-        public float yScale;
-        public float percentOfPath;
-    }
-
-    public enum PathType { Linear = 0, Circular = 1, Flexible = 2 }
-
-    public class Path
-    {
-        public List<PathNode> pathNodes = new List<PathNode>();
-
-        public float twistBegin = 0.0f;
-        public float twistEnd = 0.0f;
-        public float topShearX = 0.0f;
-        public float topShearY = 0.0f;
-        public float pathCutBegin = 0.0f;
-        public float pathCutEnd = 1.0f;
-        public float dimpleBegin = 0.0f;
-        public float dimpleEnd = 1.0f;
-        public float skew = 0.0f;
-        public float holeSizeX = 1.0f; // called pathScaleX in pbs
-        public float holeSizeY = 0.25f;
-        public float taperX = 0.0f;
-        public float taperY = 0.0f;
-        public float radius = 0.0f;
-        public float revolutions = 1.0f;
-        public int stepsPerRevolution = 24;
-
-        private const float twoPi = 2.0f * (float)Math.PI;
-
-        public void Create(PathType pathType, int steps)
-        {
-            if (pathType == PathType.Linear || pathType == PathType.Flexible)
-            {
-                int step = 0;
-
-                float length = this.pathCutEnd - this.pathCutBegin;
-                float twistTotal = twistEnd - twistBegin;
-                float twistTotalAbs = Math.Abs(twistTotal);
-                if (twistTotalAbs > 0.01f)
-                    steps += (int)(twistTotalAbs * 3.66); //  dahlia's magic number
-
-                float start = -0.5f;
-                float stepSize = length / (float)steps;
-                float percentOfPathMultiplier = stepSize;
-                float xOffset = 0.0f;
-                float yOffset = 0.0f;
-                float zOffset = start;
-                float xOffsetStepIncrement = this.topShearX / steps;
-                float yOffsetStepIncrement = this.topShearY / steps;
-
-                float percentOfPath = this.pathCutBegin;
-                zOffset += percentOfPath;
-
-                // sanity checks
-
-                bool done = false;
-
-                while (!done)
-                {
-                    PathNode newNode = new PathNode();
-
-                    newNode.xScale = 1.0f;
-                    if (this.taperX == 0.0f)
-                        newNode.xScale = 1.0f;
-                    else if (this.taperX > 0.0f)
-                        newNode.xScale = 1.0f - percentOfPath * this.taperX;
-                    else newNode.xScale = 1.0f + (1.0f - percentOfPath) * this.taperX;
-
-                    newNode.yScale = 1.0f;
-                    if (this.taperY == 0.0f)
-                        newNode.yScale = 1.0f;
-                    else if (this.taperY > 0.0f)
-                        newNode.yScale = 1.0f - percentOfPath * this.taperY;
-                    else newNode.yScale = 1.0f + (1.0f - percentOfPath) * this.taperY;
-
-                    float twist = twistBegin + twistTotal * percentOfPath;
-
-                    newNode.rotation = new Quat(new Coord(0.0f, 0.0f, 1.0f), twist);
-                    newNode.position = new Coord(xOffset, yOffset, zOffset);
-                    newNode.percentOfPath = percentOfPath;
-
-                    pathNodes.Add(newNode);
-
-                    if (step < steps)
-                    {
-                        step += 1;
-                        percentOfPath += percentOfPathMultiplier;
-                        xOffset += xOffsetStepIncrement;
-                        yOffset += yOffsetStepIncrement;
-                        zOffset += stepSize;
-                        if (percentOfPath > this.pathCutEnd)
-                            done = true;
-                    }
-                    else done = true;
-                }
-            } // end of linear path code
-
-            else // pathType == Circular
-            {
-                float twistTotal = twistEnd - twistBegin;
-
-                // if the profile has a lot of twist, add more layers otherwise the layers may overlap
-                // and the resulting mesh may be quite inaccurate. This method is arbitrary and doesn't
-                // accurately match the viewer
-                float twistTotalAbs = Math.Abs(twistTotal);
-                if (twistTotalAbs > 0.01f)
-                {
-                    if (twistTotalAbs > Math.PI * 1.5f)
-                        steps *= 2;
-                    if (twistTotalAbs > Math.PI * 3.0f)
-                        steps *= 2;
-                }
-
-                float yPathScale = this.holeSizeY * 0.5f;
-                float pathLength = this.pathCutEnd - this.pathCutBegin;
-                float totalSkew = this.skew * 2.0f * pathLength;
-                float skewStart = this.pathCutBegin * 2.0f * this.skew - this.skew;
-                float xOffsetTopShearXFactor = this.topShearX * (0.25f + 0.5f * (0.5f - this.holeSizeY));
-                float yShearCompensation = 1.0f + Math.Abs(this.topShearY) * 0.25f;
-
-                // It's not quite clear what pushY (Y top shear) does, but subtracting it from the start and end
-                // angles appears to approximate it's effects on path cut. Likewise, adding it to the angle used
-                // to calculate the sine for generating the path radius appears to approximate it's effects there
-                // too, but there are some subtle differences in the radius which are noticeable as the prim size
-                // increases and it may affect megaprims quite a bit. The effect of the Y top shear parameter on
-                // the meshes generated with this technique appear nearly identical in shape to the same prims when
-                // displayed by the viewer.
-
-                float startAngle = (twoPi * this.pathCutBegin * this.revolutions) - this.topShearY * 0.9f;
-                float endAngle = (twoPi * this.pathCutEnd * this.revolutions) - this.topShearY * 0.9f;
-                float stepSize = twoPi / this.stepsPerRevolution;
-
-                int step = (int)(startAngle / stepSize);
-//                int firstStep = step;
-                float angle = startAngle;
-
-                bool done = false;
-                while (!done) // loop through the length of the path and add the layers
-                {
-                    PathNode newNode = new PathNode();
-
-                    float xProfileScale = (1.0f - Math.Abs(this.skew)) * this.holeSizeX;
-                    float yProfileScale = this.holeSizeY;
-
-                    float percentOfPath = angle / (twoPi * this.revolutions);
-                    float percentOfAngles = (angle - startAngle) / (endAngle - startAngle);
-
-                    if (this.taperX > 0.01f)
-                        xProfileScale *= 1.0f - percentOfPath * this.taperX;
-                    else if (this.taperX < -0.01f)
-                        xProfileScale *= 1.0f + (1.0f - percentOfPath) * this.taperX;
-
-                    if (this.taperY > 0.01f)
-                        yProfileScale *= 1.0f - percentOfPath * this.taperY;
-                    else if (this.taperY < -0.01f)
-                        yProfileScale *= 1.0f + (1.0f - percentOfPath) * this.taperY;
-
-                    newNode.xScale = xProfileScale;
-                    newNode.yScale = yProfileScale;
-
-                    float radiusScale = 1.0f;
-                    if (this.radius > 0.001f)
-                        radiusScale = 1.0f - this.radius * percentOfPath;
-                    else if (this.radius < 0.001f)
-                        radiusScale = 1.0f + this.radius * (1.0f - percentOfPath);
-
-                    float twist = twistBegin + twistTotal * percentOfPath;
-
-                    float xOffset = 0.5f * (skewStart + totalSkew * percentOfAngles);
-                    xOffset += (float)Math.Sin(angle) * xOffsetTopShearXFactor;
-
-                    float yOffset = yShearCompensation * (float)Math.Cos(angle) * (0.5f - yPathScale) * radiusScale;
-
-                    float zOffset = (float)Math.Sin(angle + this.topShearY) * (0.5f - yPathScale) * radiusScale;
-
-                    newNode.position = new Coord(xOffset, yOffset, zOffset);
-
-                    // now orient the rotation of the profile layer relative to it's position on the path
-                    // adding taperY to the angle used to generate the quat appears to approximate the viewer
-
-                    newNode.rotation = new Quat(new Coord(1.0f, 0.0f, 0.0f), angle + this.topShearY);
-
-                    // next apply twist rotation to the profile layer
-                    if (twistTotal != 0.0f || twistBegin != 0.0f)
-                        newNode.rotation *= new Quat(new Coord(0.0f, 0.0f, 1.0f), twist);
-
-                    newNode.percentOfPath = percentOfPath;
-
-                    pathNodes.Add(newNode);
-
-                    // calculate terms for next iteration
-                    // calculate the angle for the next iteration of the loop
-
-                    if (angle >= endAngle - 0.01)
-                        done = true;
-                    else
-                    {
-                        step += 1;
-                        angle = stepSize * step;
-                        if (angle > endAngle)
-                            angle = endAngle;
-                    }
-                }
-            }
-        }
-    }
-
-    public class PrimMesh
-    {
-        public string errorMessage = "";
-        private const float twoPi = 2.0f * (float)Math.PI;
-
-        public List<Coord> coords;
-        public List<Coord> normals;
-        public List<Face> faces;
-
-        public List<ViewerFace> viewerFaces;
-
-        private int sides = 4;
-        private int hollowSides = 4;
-        private float profileStart = 0.0f;
-        private float profileEnd = 1.0f;
-        private float hollow = 0.0f;
-        public int twistBegin = 0;
-        public int twistEnd = 0;
-        public float topShearX = 0.0f;
-        public float topShearY = 0.0f;
-        public float pathCutBegin = 0.0f;
-        public float pathCutEnd = 1.0f;
-        public float dimpleBegin = 0.0f;
-        public float dimpleEnd = 1.0f;
-        public float skew = 0.0f;
-        public float holeSizeX = 1.0f; // called pathScaleX in pbs
-        public float holeSizeY = 0.25f;
-        public float taperX = 0.0f;
-        public float taperY = 0.0f;
-        public float radius = 0.0f;
-        public float revolutions = 1.0f;
-        public int stepsPerRevolution = 24;
-
-        private bool hasProfileCut = false;
-        private bool hasHollow = false;
-        public bool calcVertexNormals = false;
-        private bool normalsProcessed = false;
-        public bool viewerMode = false;
-
-        public int numPrimFaces = 0;
-
-        /// <summary>
-        /// Human readable string representation of the parameters used to create a mesh.
-        /// </summary>
-        /// <returns></returns>
-        public string ParamsToDisplayString()
-        {
-            string s = "";
-            s += "sides..................: " + this.sides.ToString();
-            s += "\nhollowSides..........: " + this.hollowSides.ToString();
-            s += "\nprofileStart.........: " + this.profileStart.ToString();
-            s += "\nprofileEnd...........: " + this.profileEnd.ToString();
-            s += "\nhollow...............: " + this.hollow.ToString();
-            s += "\ntwistBegin...........: " + this.twistBegin.ToString();
-            s += "\ntwistEnd.............: " + this.twistEnd.ToString();
-            s += "\ntopShearX............: " + this.topShearX.ToString();
-            s += "\ntopShearY............: " + this.topShearY.ToString();
-            s += "\npathCutBegin.........: " + this.pathCutBegin.ToString();
-            s += "\npathCutEnd...........: " + this.pathCutEnd.ToString();
-            s += "\ndimpleBegin..........: " + this.dimpleBegin.ToString();
-            s += "\ndimpleEnd............: " + this.dimpleEnd.ToString();
-            s += "\nskew.................: " + this.skew.ToString();
-            s += "\nholeSizeX............: " + this.holeSizeX.ToString();
-            s += "\nholeSizeY............: " + this.holeSizeY.ToString();
-            s += "\ntaperX...............: " + this.taperX.ToString();
-            s += "\ntaperY...............: " + this.taperY.ToString();
-            s += "\nradius...............: " + this.radius.ToString();
-            s += "\nrevolutions..........: " + this.revolutions.ToString();
-            s += "\nstepsPerRevolution...: " + this.stepsPerRevolution.ToString();
-
-            return s;
-        }
-
-        /// <summary>
-        /// Constructs a PrimMesh object and creates the profile for extrusion.
-        /// </summary>
-        /// <param name="sides"></param>
-        /// <param name="profileStart"></param>
-        /// <param name="profileEnd"></param>
-        /// <param name="hollow"></param>
-        /// <param name="hollowSides"></param>
-        public PrimMesh(int sides, float profileStart, float profileEnd, float hollow, int hollowSides)
-        {
-            this.coords = new List<Coord>();
-            this.faces = new List<Face>();
-
-            this.sides = sides;
-            this.profileStart = profileStart;
-            this.profileEnd = profileEnd;
-            this.hollow = hollow;
-            this.hollowSides = hollowSides;
-
-            if (sides < 3)
-                this.sides = 3;
-            if (hollowSides < 3)
-                this.hollowSides = 3;
-            if (profileStart < 0.0f)
-                this.profileStart = 0.0f;
-            if (profileEnd > 1.0f)
-                this.profileEnd = 1.0f;
-            if (profileEnd < 0.02f)
-                this.profileEnd = 0.02f;
-            if (profileStart >= profileEnd)
-                this.profileStart = profileEnd - 0.02f;
-            if (hollow > 0.99f)
-                this.hollow = 0.99f;
-            if (hollow < 0.0f)
-                this.hollow = 0.0f;
-
-            this.hasProfileCut = (this.profileStart > 0.0f || this.profileEnd < 1.0f);
-            this.hasHollow = (this.hollow > 0.001f);
-        }
-
-        /// <summary>
-        /// Extrudes a profile along a path.
-        /// </summary>
-        public void Extrude(PathType pathType)
-        {
-            this.coords = new List<Coord>();
-            this.faces = new List<Face>();
-
-            if (this.viewerMode)
-            {
-                this.viewerFaces = new List<ViewerFace>();
-                this.calcVertexNormals = true;
-            }
-
-            if (this.calcVertexNormals)
-                this.normals = new List<Coord>();
-
-            int steps = 1;
-
-            float length = this.pathCutEnd - this.pathCutBegin;
-            normalsProcessed = false;
-
-            if (this.viewerMode && this.sides == 3)
-            {
-                // prisms don't taper well so add some vertical resolution
-                // other prims may benefit from this but just do prisms for now
-                if (Math.Abs(this.taperX) > 0.01 || Math.Abs(this.taperY) > 0.01)
-                    steps = (int)(steps * 4.5 * length);
-            }
-
-
-            float twistBegin = this.twistBegin / 360.0f * twoPi;
-            float twistEnd = this.twistEnd / 360.0f * twoPi;
-            float twistTotal = twistEnd - twistBegin;
-            float twistTotalAbs = Math.Abs(twistTotal);
-            if (twistTotalAbs > 0.01f)
-                steps += (int)(twistTotalAbs * 3.66); //  dahlia's magic number
-
-            float hollow = this.hollow;
-
-            // sanity checks
-            float initialProfileRot = 0.0f;
-            if (pathType == PathType.Circular)
-            {
-                if (this.sides == 3)
-                {
-                    initialProfileRot = (float)Math.PI;
-                    if (this.hollowSides == 4)
-                    {
-                        if (hollow > 0.7f)
-                            hollow = 0.7f;
-                        hollow *= 0.707f;
-                    }
-                    else hollow *= 0.5f;
-                }
-                else if (this.sides == 4)
-                {
-                    initialProfileRot = 0.25f * (float)Math.PI;
-                    if (this.hollowSides != 4)
-                        hollow *= 0.707f;
-                }
-                else if (this.sides > 4)
-                {
-                    initialProfileRot = (float)Math.PI;
-                    if (this.hollowSides == 4)
-                    {
-                        if (hollow > 0.7f)
-                            hollow = 0.7f;
-                        hollow /= 0.7f;
-                    }
-                }
-            }
-            else
-            {
-                if (this.sides == 3)
-                {
-                    if (this.hollowSides == 4)
-                    {
-                        if (hollow > 0.7f)
-                            hollow = 0.7f;
-                        hollow *= 0.707f;
-                    }
-                    else hollow *= 0.5f;
-                }
-                else if (this.sides == 4)
-                {
-                    initialProfileRot = 1.25f * (float)Math.PI;
-                    if (this.hollowSides != 4)
-                        hollow *= 0.707f;
-                }
-                else if (this.sides == 24 && this.hollowSides == 4)
-                    hollow *= 1.414f;
-            }
-
-            Profile profile = new Profile(this.sides, this.profileStart, this.profileEnd, hollow, this.hollowSides, true, calcVertexNormals);
-            this.errorMessage = profile.errorMessage;
-
-            this.numPrimFaces = profile.numPrimFaces;
-
-            int cut1Vert = -1;
-            int cut2Vert = -1;
-            if (hasProfileCut)
-            {
-                cut1Vert = hasHollow ? profile.coords.Count - 1 : 0;
-                cut2Vert = hasHollow ? profile.numOuterVerts - 1 : profile.numOuterVerts;
-            }
-
-            if (initialProfileRot != 0.0f)
-            {
-                profile.AddRot(new Quat(new Coord(0.0f, 0.0f, 1.0f), initialProfileRot));
-                if (viewerMode)
-                    profile.MakeFaceUVs();
-            }
-
-            Coord lastCutNormal1 = new Coord();
-            Coord lastCutNormal2 = new Coord();
-            float lastV = 1.0f;
-
-            Path path = new Path();
-            path.twistBegin = twistBegin;
-            path.twistEnd = twistEnd;
-            path.topShearX = topShearX;
-            path.topShearY = topShearY;
-            path.pathCutBegin = pathCutBegin;
-            path.pathCutEnd = pathCutEnd;
-            path.dimpleBegin = dimpleBegin;
-            path.dimpleEnd = dimpleEnd;
-            path.skew = skew;
-            path.holeSizeX = holeSizeX;
-            path.holeSizeY = holeSizeY;
-            path.taperX = taperX;
-            path.taperY = taperY;
-            path.radius = radius;
-            path.revolutions = revolutions;
-            path.stepsPerRevolution = stepsPerRevolution;
-
-            path.Create(pathType, steps);
-
-            bool needEndFaces = false;
-            if (pathType == PathType.Circular)
-            {
-                needEndFaces = false;
-                if (this.pathCutBegin != 0.0f || this.pathCutEnd != 1.0f)
-                    needEndFaces = true;
-                else if (this.taperX != 0.0f || this.taperY != 0.0f)
-                    needEndFaces = true;
-                else if (this.skew != 0.0f)
-                    needEndFaces = true;
-                else if (twistTotal != 0.0f)
-                    needEndFaces = true;
-                else if (this.radius != 0.0f)
-                    needEndFaces = true;
-            }
-            else needEndFaces = true;
-
-            for (int nodeIndex = 0; nodeIndex < path.pathNodes.Count; nodeIndex++)
-            {
-                PathNode node = path.pathNodes[nodeIndex];
-                Profile newLayer = profile.Copy();
-                newLayer.Scale(node.xScale, node.yScale);
-
-                newLayer.AddRot(node.rotation);
-                newLayer.AddPos(node.position);
-
-                if (needEndFaces && nodeIndex == 0)
-                {
-                    newLayer.FlipNormals();
-
-                    // add the top faces to the viewerFaces list here
-                    if (this.viewerMode)
-                    {
-                        Coord faceNormal = newLayer.faceNormal;
-                        ViewerFace newViewerFace = new ViewerFace(profile.bottomFaceNumber);
-                        int numFaces = newLayer.faces.Count;
-                        List<Face> faces = newLayer.faces;
-
-                        for (int i = 0; i < numFaces; i++)
-                        {
-                            Face face = faces[i];
-                            newViewerFace.v1 = newLayer.coords[face.v1];
-                            newViewerFace.v2 = newLayer.coords[face.v2];
-                            newViewerFace.v3 = newLayer.coords[face.v3];
-
-                            newViewerFace.coordIndex1 = face.v1;
-                            newViewerFace.coordIndex2 = face.v2;
-                            newViewerFace.coordIndex3 = face.v3;
-
-                            newViewerFace.n1 = faceNormal;
-                            newViewerFace.n2 = faceNormal;
-                            newViewerFace.n3 = faceNormal;
-
-                            newViewerFace.uv1 = newLayer.faceUVs[face.v1];
-                            newViewerFace.uv2 = newLayer.faceUVs[face.v2];
-                            newViewerFace.uv3 = newLayer.faceUVs[face.v3];
-
-                            this.viewerFaces.Add(newViewerFace);
-                        }
-                    }
-                } // if (nodeIndex == 0)
-
-                // append this layer
-
-                int coordsLen = this.coords.Count;
-//                int lastCoordsLen = coordsLen;
-                newLayer.AddValue2FaceVertexIndices(coordsLen);
-
-                this.coords.AddRange(newLayer.coords);
-
-                if (this.calcVertexNormals)
-                {
-                    newLayer.AddValue2FaceNormalIndices(this.normals.Count);
-                    this.normals.AddRange(newLayer.vertexNormals);
-                }
-
-                if (node.percentOfPath < this.pathCutBegin + 0.01f || node.percentOfPath > this.pathCutEnd - 0.01f)
-                    this.faces.AddRange(newLayer.faces);
-
-                // fill faces between layers
-
-                int numVerts = newLayer.coords.Count;
-                Face newFace = new Face();
-
-                if (nodeIndex > 0)
-                {
-                    int startVert = coordsLen + 1;
-                    int endVert = this.coords.Count;
-
-                    if (sides < 5 || this.hasProfileCut || hollow > 0.0f)
-                        startVert--;
-
-                    for (int i = startVert; i < endVert; i++)
-                    {
-                        int iNext = i + 1;
-                        if (i == endVert - 1)
-                            iNext = startVert;
-
-                        int whichVert = i - startVert;
-
-                        newFace.v1 = i;
-                        newFace.v2 = i - numVerts;
-                        newFace.v3 = iNext - numVerts;
-                        this.faces.Add(newFace);
-
-                        newFace.v2 = iNext - numVerts;
-                        newFace.v3 = iNext;
-                        this.faces.Add(newFace);
-
-                        if (this.viewerMode)
-                        {
-                            // add the side faces to the list of viewerFaces here
-
-                            int primFaceNum = profile.faceNumbers[whichVert];
-                            if (!needEndFaces)
-                                primFaceNum -= 1;
-
-                            ViewerFace newViewerFace1 = new ViewerFace(primFaceNum);
-                            ViewerFace newViewerFace2 = new ViewerFace(primFaceNum);
-
-                            float u1 = newLayer.us[whichVert];
-                            float u2 = 1.0f;
-                            if (whichVert < newLayer.us.Count - 1)
-                                u2 = newLayer.us[whichVert + 1];
-
-                            if (whichVert == cut1Vert || whichVert == cut2Vert)
-                            {
-                                u1 = 0.0f;
-                                u2 = 1.0f;
-                            }
-                            else if (sides < 5)
-                            {
-                                if (whichVert < profile.numOuterVerts)
-                                { // boxes and prisms have one texture face per side of the prim, so the U values have to be scaled
-                                    // to reflect the entire texture width
-                                    u1 *= sides;
-                                    u2 *= sides;
-                                    u2 -= (int)u1;
-                                    u1 -= (int)u1;
-                                    if (u2 < 0.1f)
-                                        u2 = 1.0f;
-                                }
-                                else if (whichVert > profile.coords.Count - profile.numHollowVerts - 1)
-                                {
-                                    u1 *= 2.0f;
-                                    u2 *= 2.0f;
-                                }
-                            }
-
-                            newViewerFace1.uv1.U = u1;
-                            newViewerFace1.uv2.U = u1;
-                            newViewerFace1.uv3.U = u2;
-
-                            newViewerFace1.uv1.V = 1.0f - node.percentOfPath;
-                            newViewerFace1.uv2.V = lastV;
-                            newViewerFace1.uv3.V = lastV;
-
-                            newViewerFace2.uv1.U = u1;
-                            newViewerFace2.uv2.U = u2;
-                            newViewerFace2.uv3.U = u2;
-
-                            newViewerFace2.uv1.V = 1.0f - node.percentOfPath;
-                            newViewerFace2.uv2.V = lastV;
-                            newViewerFace2.uv3.V = 1.0f - node.percentOfPath;
-
-                            newViewerFace1.v1 = this.coords[i];
-                            newViewerFace1.v2 = this.coords[i - numVerts];
-                            newViewerFace1.v3 = this.coords[iNext - numVerts];
-
-                            newViewerFace2.v1 = this.coords[i];
-                            newViewerFace2.v2 = this.coords[iNext - numVerts];
-                            newViewerFace2.v3 = this.coords[iNext];
-
-                            newViewerFace1.coordIndex1 = i;
-                            newViewerFace1.coordIndex2 = i - numVerts;
-                            newViewerFace1.coordIndex3 = iNext - numVerts;
-
-                            newViewerFace2.coordIndex1 = i;
-                            newViewerFace2.coordIndex2 = iNext - numVerts;
-                            newViewerFace2.coordIndex3 = iNext;
-
-                            // profile cut faces
-                            if (whichVert == cut1Vert)
-                            {
-                                newViewerFace1.n1 = newLayer.cutNormal1;
-                                newViewerFace1.n2 = newViewerFace1.n3 = lastCutNormal1;
-
-                                newViewerFace2.n1 = newViewerFace2.n3 = newLayer.cutNormal1;
-                                newViewerFace2.n2 = lastCutNormal1;
-                            }
-                            else if (whichVert == cut2Vert)
-                            {
-                                newViewerFace1.n1 = newLayer.cutNormal2;
-                                newViewerFace1.n2 = newViewerFace1.n3 = lastCutNormal2;
-
-                                newViewerFace2.n1 = newViewerFace2.n3 = newLayer.cutNormal2;
-                                newViewerFace2.n2 = lastCutNormal2;
-                            }
-
-                            else // outer and hollow faces
-                            {
-                                if ((sides < 5 && whichVert < newLayer.numOuterVerts) || (hollowSides < 5 && whichVert >= newLayer.numOuterVerts))
-                                { // looks terrible when path is twisted... need vertex normals here
-                                    newViewerFace1.CalcSurfaceNormal();
-                                    newViewerFace2.CalcSurfaceNormal();
-                                }
-                                else
-                                {
-                                    newViewerFace1.n1 = this.normals[i];
-                                    newViewerFace1.n2 = this.normals[i - numVerts];
-                                    newViewerFace1.n3 = this.normals[iNext - numVerts];
-
-                                    newViewerFace2.n1 = this.normals[i];
-                                    newViewerFace2.n2 = this.normals[iNext - numVerts];
-                                    newViewerFace2.n3 = this.normals[iNext];
-                                }
-                            }
-
-                            this.viewerFaces.Add(newViewerFace1);
-                            this.viewerFaces.Add(newViewerFace2);
-
-                        }
-                    }
-                }
-
-                lastCutNormal1 = newLayer.cutNormal1;
-                lastCutNormal2 = newLayer.cutNormal2;
-                lastV = 1.0f - node.percentOfPath;
-
-                if (needEndFaces && nodeIndex == path.pathNodes.Count - 1 && viewerMode)
-                {
-                    // add the top faces to the viewerFaces list here
-                    Coord faceNormal = newLayer.faceNormal;
-                    ViewerFace newViewerFace = new ViewerFace();
-                    newViewerFace.primFaceNumber = 0;
-                    int numFaces = newLayer.faces.Count;
-                    List<Face> faces = newLayer.faces;
-
-                    for (int i = 0; i < numFaces; i++)
-                    {
-                        Face face = faces[i];
-                        newViewerFace.v1 = newLayer.coords[face.v1 - coordsLen];
-                        newViewerFace.v2 = newLayer.coords[face.v2 - coordsLen];
-                        newViewerFace.v3 = newLayer.coords[face.v3 - coordsLen];
-
-                        newViewerFace.coordIndex1 = face.v1 - coordsLen;
-                        newViewerFace.coordIndex2 = face.v2 - coordsLen;
-                        newViewerFace.coordIndex3 = face.v3 - coordsLen;
-
-                        newViewerFace.n1 = faceNormal;
-                        newViewerFace.n2 = faceNormal;
-                        newViewerFace.n3 = faceNormal;
-
-                        newViewerFace.uv1 = newLayer.faceUVs[face.v1 - coordsLen];
-                        newViewerFace.uv2 = newLayer.faceUVs[face.v2 - coordsLen];
-                        newViewerFace.uv3 = newLayer.faceUVs[face.v3 - coordsLen];
-
-                        this.viewerFaces.Add(newViewerFace);
-                    }
-                }
-
-
-            } // for (int nodeIndex = 0; nodeIndex < path.pathNodes.Count; nodeIndex++)
-
-        }
-
-
-        /// <summary>
-        /// DEPRICATED - use Extrude(PathType.Linear) instead
-        /// Extrudes a profile along a straight line path. Used for prim types box, cylinder, and prism.
-        /// </summary>
-        /// 
-        public void ExtrudeLinear()
-        {
-            this.Extrude(PathType.Linear);
-        }
-
-
-        /// <summary>
-        /// DEPRICATED - use Extrude(PathType.Circular) instead
-        /// Extrude a profile into a circular path prim mesh. Used for prim types torus, tube, and ring.
-        /// </summary>
-        /// 
-        public void ExtrudeCircular()
-        {
-            this.Extrude(PathType.Circular);
-        }
-
-
-        private Coord SurfaceNormal(Coord c1, Coord c2, Coord c3)
-        {
-            Coord edge1 = new Coord(c2.X - c1.X, c2.Y - c1.Y, c2.Z - c1.Z);
-            Coord edge2 = new Coord(c3.X - c1.X, c3.Y - c1.Y, c3.Z - c1.Z);
-
-            Coord normal = Coord.Cross(edge1, edge2);
-
-            normal.Normalize();
-
-            return normal;
-        }
-
-        private Coord SurfaceNormal(Face face)
-        {
-            return SurfaceNormal(this.coords[face.v1], this.coords[face.v2], this.coords[face.v3]);
-        }
-
-        /// <summary>
-        /// Calculate the surface normal for a face in the list of faces
-        /// </summary>
-        /// <param name="faceIndex"></param>
-        /// <returns></returns>
-        public Coord SurfaceNormal(int faceIndex)
-        {
-            int numFaces = this.faces.Count;
-            if (faceIndex < 0 || faceIndex >= numFaces)
-                throw new Exception("faceIndex out of range");
-
-            return SurfaceNormal(this.faces[faceIndex]);
-        }
-
-        /// <summary>
-        /// Duplicates a PrimMesh object. All object properties are copied by value, including lists.
-        /// </summary>
-        /// <returns></returns>
-        public PrimMesh Copy()
-        {
-            PrimMesh copy = new PrimMesh(this.sides, this.profileStart, this.profileEnd, this.hollow, this.hollowSides);
-            copy.twistBegin = this.twistBegin;
-            copy.twistEnd = this.twistEnd;
-            copy.topShearX = this.topShearX;
-            copy.topShearY = this.topShearY;
-            copy.pathCutBegin = this.pathCutBegin;
-            copy.pathCutEnd = this.pathCutEnd;
-            copy.dimpleBegin = this.dimpleBegin;
-            copy.dimpleEnd = this.dimpleEnd;
-            copy.skew = this.skew;
-            copy.holeSizeX = this.holeSizeX;
-            copy.holeSizeY = this.holeSizeY;
-            copy.taperX = this.taperX;
-            copy.taperY = this.taperY;
-            copy.radius = this.radius;
-            copy.revolutions = this.revolutions;
-            copy.stepsPerRevolution = this.stepsPerRevolution;
-            copy.calcVertexNormals = this.calcVertexNormals;
-            copy.normalsProcessed = this.normalsProcessed;
-            copy.viewerMode = this.viewerMode;
-            copy.numPrimFaces = this.numPrimFaces;
-            copy.errorMessage = this.errorMessage;
-
-            copy.coords = new List<Coord>(this.coords);
-            copy.faces = new List<Face>(this.faces);
-            copy.viewerFaces = new List<ViewerFace>(this.viewerFaces);
-            copy.normals = new List<Coord>(this.normals);
-
-            return copy;
-        }
-
-        /// <summary>
-        /// Calculate surface normals for all of the faces in the list of faces in this mesh
-        /// </summary>
-        public void CalcNormals()
-        {
-            if (normalsProcessed)
-                return;
-
-            normalsProcessed = true;
-
-            int numFaces = faces.Count;
-
-            if (!this.calcVertexNormals)
-                this.normals = new List<Coord>();
-
-            for (int i = 0; i < numFaces; i++)
-            {
-                Face face = faces[i];
-
-                this.normals.Add(SurfaceNormal(i).Normalize());
-
-                int normIndex = normals.Count - 1;
-                face.n1 = normIndex;
-                face.n2 = normIndex;
-                face.n3 = normIndex;
-
-                this.faces[i] = face;
-            }
-        }
-
-        /// <summary>
-        /// Adds a value to each XYZ vertex coordinate in the mesh
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <param name="z"></param>
-        public void AddPos(float x, float y, float z)
-        {
-            int i;
-            int numVerts = this.coords.Count;
-            Coord vert;
-
-            for (i = 0; i < numVerts; i++)
-            {
-                vert = this.coords[i];
-                vert.X += x;
-                vert.Y += y;
-                vert.Z += z;
-                this.coords[i] = vert;
-            }
-
-            if (this.viewerFaces != null)
-            {
-                int numViewerFaces = this.viewerFaces.Count;
-
-                for (i = 0; i < numViewerFaces; i++)
-                {
-                    ViewerFace v = this.viewerFaces[i];
-                    v.AddPos(x, y, z);
-                    this.viewerFaces[i] = v;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Rotates the mesh
-        /// </summary>
-        /// <param name="q"></param>
-        public void AddRot(Quat q)
-        {
-            int i;
-            int numVerts = this.coords.Count;
-
-            for (i = 0; i < numVerts; i++)
-                this.coords[i] *= q;
-
-            if (this.normals != null)
-            {
-                int numNormals = this.normals.Count;
-                for (i = 0; i < numNormals; i++)
-                    this.normals[i] *= q;
-            }
-
-            if (this.viewerFaces != null)
-            {
-                int numViewerFaces = this.viewerFaces.Count;
-
-                for (i = 0; i < numViewerFaces; i++)
-                {
-                    ViewerFace v = this.viewerFaces[i];
-                    v.v1 *= q;
-                    v.v2 *= q;
-                    v.v3 *= q;
-
-                    v.n1 *= q;
-                    v.n2 *= q;
-                    v.n3 *= q;
-                    this.viewerFaces[i] = v;
-                }
-            }
-        }
-
-#if VERTEX_INDEXER
-        public VertexIndexer GetVertexIndexer()
-        {
-            if (this.viewerMode && this.viewerFaces.Count > 0)
-                return new VertexIndexer(this);
-            return null;
-        }
-#endif
-
-        /// <summary>
-        /// Scales the mesh
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <param name="z"></param>
-        public void Scale(float x, float y, float z)
-        {
-            int i;
-            int numVerts = this.coords.Count;
-            //Coord vert;
-
-            Coord m = new Coord(x, y, z);
-            for (i = 0; i < numVerts; i++)
-                this.coords[i] *= m;
-
-            if (this.viewerFaces != null)
-            {
-                int numViewerFaces = this.viewerFaces.Count;
-                for (i = 0; i < numViewerFaces; i++)
-                {
-                    ViewerFace v = this.viewerFaces[i];
-                    v.v1 *= m;
-                    v.v2 *= m;
-                    v.v3 *= m;
-                    this.viewerFaces[i] = v;
-                }
-
-            }
-
-        }
-
-        /// <summary>
-        /// Dumps the mesh to a Blender compatible "Raw" format file
-        /// </summary>
-        /// <param name="path"></param>
-        /// <param name="name"></param>
-        /// <param name="title"></param>
-        public void DumpRaw(String path, String name, String title)
-        {
-            if (path == null)
-                return;
-            String fileName = name + "_" + title + ".raw";
-            String completePath = System.IO.Path.Combine(path, fileName);
-            StreamWriter sw = new StreamWriter(completePath);
-
-            for (int i = 0; i < this.faces.Count; i++)
-            {
-                string s = this.coords[this.faces[i].v1].ToString();
-                s += " " + this.coords[this.faces[i].v2].ToString();
-                s += " " + this.coords[this.faces[i].v3].ToString();
-
-                sw.WriteLine(s);
-            }
-
-            sw.Close();
-        }
-    }
-}
+/*

+ * Copyright (c) Contributors

+ * See CONTRIBUTORS.TXT for a full list of copyright holders.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *     * Redistributions of source code must retain the above copyright

+ *       notice, this list of conditions and the following disclaimer.

+ *     * Redistributions in binary form must reproduce the above copyright

+ *       notice, this list of conditions and the following disclaimer in the

+ *       documentation and/or other materials provided with the distribution.

+ *     * Neither the name of the OpenSimulator Project nor the

+ *       names of its contributors may be used to endorse or promote products

+ *       derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ */

+

+using System;

+using System.Collections.Generic;

+using System.Text;

+using System.IO;

+

+namespace PrimMesher

+{

+    public struct Quat

+    {

+        /// <summary>X value</summary>

+        public float X;

+        /// <summary>Y value</summary>

+        public float Y;

+        /// <summary>Z value</summary>

+        public float Z;

+        /// <summary>W value</summary>

+        public float W;

+

+        public Quat(float x, float y, float z, float w)

+        {

+            X = x;

+            Y = y;

+            Z = z;

+            W = w;

+        }

+

+        public Quat(Coord axis, float angle)

+        {

+            axis = axis.Normalize();

+

+            angle *= 0.5f;

+            float c = (float)Math.Cos(angle);

+            float s = (float)Math.Sin(angle);

+

+            X = axis.X * s;

+            Y = axis.Y * s;

+            Z = axis.Z * s;

+            W = c;

+

+            Normalize();

+        }

+

+        public float Length()

+        {

+            return (float)Math.Sqrt(X * X + Y * Y + Z * Z + W * W);

+        }

+

+        public Quat Normalize()

+        {

+            const float MAG_THRESHOLD = 0.0000001f;

+            float mag = Length();

+

+            // Catch very small rounding errors when normalizing

+            if (mag > MAG_THRESHOLD)

+            {

+                float oomag = 1f / mag;

+                X *= oomag;

+                Y *= oomag;

+                Z *= oomag;

+                W *= oomag;

+            }

+            else

+            {

+                X = 0f;

+                Y = 0f;

+                Z = 0f;

+                W = 1f;

+            }

+

+            return this;

+        }

+

+        public static Quat operator *(Quat q1, Quat q2)

+        {

+            float x = q1.W * q2.X + q1.X * q2.W + q1.Y * q2.Z - q1.Z * q2.Y;

+            float y = q1.W * q2.Y - q1.X * q2.Z + q1.Y * q2.W + q1.Z * q2.X;

+            float z = q1.W * q2.Z + q1.X * q2.Y - q1.Y * q2.X + q1.Z * q2.W;

+            float w = q1.W * q2.W - q1.X * q2.X - q1.Y * q2.Y - q1.Z * q2.Z;

+            return new Quat(x, y, z, w);

+        }

+

+        public override string ToString()

+        {

+            return "< X: " + this.X.ToString() + ", Y: " + this.Y.ToString() + ", Z: " + this.Z.ToString() + ", W: " + this.W.ToString() + ">";

+        }

+    }

+

+    public struct Coord

+    {

+        public float X;

+        public float Y;

+        public float Z;

+

+        public Coord(float x, float y, float z)

+        {

+            this.X = x;

+            this.Y = y;

+            this.Z = z;

+        }

+

+        public float Length()

+        {

+            return (float)Math.Sqrt(this.X * this.X + this.Y * this.Y + this.Z * this.Z);

+        }

+

+        public Coord Invert()

+        {

+            this.X = -this.X;

+            this.Y = -this.Y;

+            this.Z = -this.Z;

+

+            return this;

+        }

+

+        public Coord Normalize()

+        {

+            const float MAG_THRESHOLD = 0.0000001f;

+            float mag = Length();

+

+            // Catch very small rounding errors when normalizing

+            if (mag > MAG_THRESHOLD)

+            {

+                float oomag = 1.0f / mag;

+                this.X *= oomag;

+                this.Y *= oomag;

+                this.Z *= oomag;

+            }

+            else

+            {

+                this.X = 0.0f;

+                this.Y = 0.0f;

+                this.Z = 0.0f;

+            }

+

+            return this;

+        }

+

+        public override string ToString()

+        {

+            return this.X.ToString() + " " + this.Y.ToString() + " " + this.Z.ToString();

+        }

+

+        public static Coord Cross(Coord c1, Coord c2)

+        {

+            return new Coord(

+                c1.Y * c2.Z - c2.Y * c1.Z,

+                c1.Z * c2.X - c2.Z * c1.X,

+                c1.X * c2.Y - c2.X * c1.Y

+                );

+        }

+

+        public static Coord operator +(Coord v, Coord a)

+        {

+            return new Coord(v.X + a.X, v.Y + a.Y, v.Z + a.Z);

+        }

+

+        public static Coord operator *(Coord v, Coord m)

+        {

+            return new Coord(v.X * m.X, v.Y * m.Y, v.Z * m.Z);

+        }

+

+        public static Coord operator *(Coord v, Quat q)

+        {

+            // From http://www.euclideanspace.com/maths/algebra/realNormedAlgebra/quaternions/transforms/

+

+            Coord c2 = new Coord(0.0f, 0.0f, 0.0f);

+

+            c2.X = q.W * q.W * v.X +

+                2f * q.Y * q.W * v.Z -

+                2f * q.Z * q.W * v.Y +

+                     q.X * q.X * v.X +

+                2f * q.Y * q.X * v.Y +

+                2f * q.Z * q.X * v.Z -

+                     q.Z * q.Z * v.X -

+                     q.Y * q.Y * v.X;

+

+            c2.Y =

+                2f * q.X * q.Y * v.X +

+                     q.Y * q.Y * v.Y +

+                2f * q.Z * q.Y * v.Z +

+                2f * q.W * q.Z * v.X -

+                     q.Z * q.Z * v.Y +

+                     q.W * q.W * v.Y -

+                2f * q.X * q.W * v.Z -

+                     q.X * q.X * v.Y;

+

+            c2.Z =

+                2f * q.X * q.Z * v.X +

+                2f * q.Y * q.Z * v.Y +

+                     q.Z * q.Z * v.Z -

+                2f * q.W * q.Y * v.X -

+                     q.Y * q.Y * v.Z +

+                2f * q.W * q.X * v.Y -

+                     q.X * q.X * v.Z +

+                     q.W * q.W * v.Z;

+

+            return c2;

+        }

+    }

+

+    public struct UVCoord

+    {

+        public float U;

+        public float V;

+

+

+        public UVCoord(float u, float v)

+        {

+            this.U = u;

+            this.V = v;

+        }

+    }

+

+    public struct Face

+    {

+        public int primFace;

+

+        // vertices

+        public int v1;

+        public int v2;

+        public int v3;

+

+        //normals

+        public int n1;

+        public int n2;

+        public int n3;

+

+        // uvs

+        public int uv1;

+        public int uv2;

+        public int uv3;

+

+

+        public Face(int v1, int v2, int v3)

+        {

+            primFace = 0;

+

+            this.v1 = v1;

+            this.v2 = v2;

+            this.v3 = v3;

+

+            this.n1 = 0;

+            this.n2 = 0;

+            this.n3 = 0;

+

+            this.uv1 = 0;

+            this.uv2 = 0;

+            this.uv3 = 0;

+

+        }

+

+        public Face(int v1, int v2, int v3, int n1, int n2, int n3)

+        {

+            primFace = 0;

+

+            this.v1 = v1;

+            this.v2 = v2;

+            this.v3 = v3;

+

+            this.n1 = n1;

+            this.n2 = n2;

+            this.n3 = n3;

+

+            this.uv1 = 0;

+            this.uv2 = 0;

+            this.uv3 = 0;

+        }

+

+        public Coord SurfaceNormal(List<Coord> coordList)

+        {

+            Coord c1 = coordList[this.v1];

+            Coord c2 = coordList[this.v2];

+            Coord c3 = coordList[this.v3];

+

+            Coord edge1 = new Coord(c2.X - c1.X, c2.Y - c1.Y, c2.Z - c1.Z);

+            Coord edge2 = new Coord(c3.X - c1.X, c3.Y - c1.Y, c3.Z - c1.Z);

+

+            return Coord.Cross(edge1, edge2).Normalize();

+        }

+    }

+

+    public struct ViewerFace

+    {

+        public int primFaceNumber;

+

+        public Coord v1;

+        public Coord v2;

+        public Coord v3;

+

+        public int coordIndex1;

+        public int coordIndex2;

+        public int coordIndex3;

+

+        public Coord n1;

+        public Coord n2;

+        public Coord n3;

+

+        public UVCoord uv1;

+        public UVCoord uv2;

+        public UVCoord uv3;

+

+        public ViewerFace(int primFaceNumber)

+        {

+            this.primFaceNumber = primFaceNumber;

+

+            this.v1 = new Coord();

+            this.v2 = new Coord();

+            this.v3 = new Coord();

+

+            this.coordIndex1 = this.coordIndex2 = this.coordIndex3 = -1; // -1 means not assigned yet

+

+            this.n1 = new Coord();

+            this.n2 = new Coord();

+            this.n3 = new Coord();

+

+            this.uv1 = new UVCoord();

+            this.uv2 = new UVCoord();

+            this.uv3 = new UVCoord();

+        }

+

+        public void Scale(float x, float y, float z)

+        {

+            this.v1.X *= x;

+            this.v1.Y *= y;

+            this.v1.Z *= z;

+

+            this.v2.X *= x;

+            this.v2.Y *= y;

+            this.v2.Z *= z;

+

+            this.v3.X *= x;

+            this.v3.Y *= y;

+            this.v3.Z *= z;

+        }

+

+        public void AddPos(float x, float y, float z)

+        {

+            this.v1.X += x;

+            this.v2.X += x;

+            this.v3.X += x;

+

+            this.v1.Y += y;

+            this.v2.Y += y;

+            this.v3.Y += y;

+

+            this.v1.Z += z;

+            this.v2.Z += z;

+            this.v3.Z += z;

+        }

+

+        public void AddRot(Quat q)

+        {

+            this.v1 *= q;

+            this.v2 *= q;

+            this.v3 *= q;

+

+            this.n1 *= q;

+            this.n2 *= q;

+            this.n3 *= q;

+        }

+

+        public void CalcSurfaceNormal()

+        {

+

+            Coord edge1 = new Coord(this.v2.X - this.v1.X, this.v2.Y - this.v1.Y, this.v2.Z - this.v1.Z);

+            Coord edge2 = new Coord(this.v3.X - this.v1.X, this.v3.Y - this.v1.Y, this.v3.Z - this.v1.Z);

+

+            this.n1 = this.n2 = this.n3 = Coord.Cross(edge1, edge2).Normalize();

+        }

+    }

+

+    internal struct Angle

+    {

+        internal float angle;

+        internal float X;

+        internal float Y;

+

+        internal Angle(float angle, float x, float y)

+        {

+            this.angle = angle;

+            this.X = x;

+            this.Y = y;

+        }

+    }

+

+    internal class AngleList

+    {

+        private float iX, iY; // intersection point

+

+        private static Angle[] angles3 =

+        {

+            new Angle(0.0f, 1.0f, 0.0f),

+            new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f),

+            new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f),

+            new Angle(1.0f, 1.0f, 0.0f)

+        };

+

+        private static Coord[] normals3 =

+        {

+            new Coord(0.25f, 0.4330127019f, 0.0f).Normalize(),

+            new Coord(-0.5f, 0.0f, 0.0f).Normalize(),

+            new Coord(0.25f, -0.4330127019f, 0.0f).Normalize(),

+            new Coord(0.25f, 0.4330127019f, 0.0f).Normalize()

+        };

+

+        private static Angle[] angles4 =

+        {

+            new Angle(0.0f, 1.0f, 0.0f),

+            new Angle(0.25f, 0.0f, 1.0f),

+            new Angle(0.5f, -1.0f, 0.0f),

+            new Angle(0.75f, 0.0f, -1.0f),

+            new Angle(1.0f, 1.0f, 0.0f)

+        };

+

+        private static Coord[] normals4 = 

+        {

+            new Coord(0.5f, 0.5f, 0.0f).Normalize(),

+            new Coord(-0.5f, 0.5f, 0.0f).Normalize(),

+            new Coord(-0.5f, -0.5f, 0.0f).Normalize(),

+            new Coord(0.5f, -0.5f, 0.0f).Normalize(),

+            new Coord(0.5f, 0.5f, 0.0f).Normalize()

+        };

+

+        private static Angle[] angles24 =

+        {

+            new Angle(0.0f, 1.0f, 0.0f),

+            new Angle(0.041666666666666664f, 0.96592582628906831f, 0.25881904510252074f),

+            new Angle(0.083333333333333329f, 0.86602540378443871f, 0.5f),

+            new Angle(0.125f, 0.70710678118654757f, 0.70710678118654746f),

+            new Angle(0.16666666666666667f, 0.5f, 0.8660254037844386f),

+            new Angle(0.20833333333333331f, 0.25881904510252096f, 0.9659258262890682f),

+            new Angle(0.25f, 0.0f, 1.0f),

+            new Angle(0.29166666666666663f, -0.25881904510252063f, 0.96592582628906831f),

+            new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f),

+            new Angle(0.375f, -0.70710678118654746f, 0.70710678118654757f),

+            new Angle(0.41666666666666663f, -0.86602540378443849f, 0.5f),

+            new Angle(0.45833333333333331f, -0.9659258262890682f, 0.25881904510252102f),

+            new Angle(0.5f, -1.0f, 0.0f),

+            new Angle(0.54166666666666663f, -0.96592582628906842f, -0.25881904510252035f),

+            new Angle(0.58333333333333326f, -0.86602540378443882f, -0.5f),

+            new Angle(0.62499999999999989f, -0.70710678118654791f, -0.70710678118654713f),

+            new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f),

+            new Angle(0.70833333333333326f, -0.25881904510252152f, -0.96592582628906809f),

+            new Angle(0.75f, 0.0f, -1.0f),

+            new Angle(0.79166666666666663f, 0.2588190451025203f, -0.96592582628906842f),

+            new Angle(0.83333333333333326f, 0.5f, -0.86602540378443904f),

+            new Angle(0.875f, 0.70710678118654735f, -0.70710678118654768f),

+            new Angle(0.91666666666666663f, 0.86602540378443837f, -0.5f),

+            new Angle(0.95833333333333326f, 0.96592582628906809f, -0.25881904510252157f),

+            new Angle(1.0f, 1.0f, 0.0f)

+        };

+

+        private Angle interpolatePoints(float newPoint, Angle p1, Angle p2)

+        {

+            float m = (newPoint - p1.angle) / (p2.angle - p1.angle);

+            return new Angle(newPoint, p1.X + m * (p2.X - p1.X), p1.Y + m * (p2.Y - p1.Y));

+        }

+

+        private void intersection(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4)

+        { // ref: http://local.wasp.uwa.edu.au/~pbourke/geometry/lineline2d/

+            double denom = (y4 - y3) * (x2 - x1) - (x4 - x3) * (y2 - y1);

+            double uaNumerator = (x4 - x3) * (y1 - y3) - (y4 - y3) * (x1 - x3);

+

+            if (denom != 0.0)

+            {

+                double ua = uaNumerator / denom;

+                iX = (float)(x1 + ua * (x2 - x1));

+                iY = (float)(y1 + ua * (y2 - y1));

+            }

+        }

+

+        internal List<Angle> angles;

+        internal List<Coord> normals;

+

+        internal void makeAngles(int sides, float startAngle, float stopAngle)

+        {

+            angles = new List<Angle>();

+            normals = new List<Coord>();

+

+            double twoPi = System.Math.PI * 2.0;

+            float twoPiInv = 1.0f / (float)twoPi;

+

+            if (sides < 1)

+                throw new Exception("number of sides not greater than zero");

+            if (stopAngle <= startAngle)

+                throw new Exception("stopAngle not greater than startAngle");

+

+            if ((sides == 3 || sides == 4 || sides == 24))

+            {

+                startAngle *= twoPiInv;

+                stopAngle *= twoPiInv;

+

+                Angle[] sourceAngles;

+                if (sides == 3)

+                    sourceAngles = angles3;

+                else if (sides == 4)

+                    sourceAngles = angles4;

+                else sourceAngles = angles24;

+

+                int startAngleIndex = (int)(startAngle * sides);

+                int endAngleIndex = sourceAngles.Length - 1;

+                if (stopAngle < 1.0f)

+                    endAngleIndex = (int)(stopAngle * sides) + 1;

+                if (endAngleIndex == startAngleIndex)

+                    endAngleIndex++;

+

+                for (int angleIndex = startAngleIndex; angleIndex < endAngleIndex + 1; angleIndex++)

+                {

+                    angles.Add(sourceAngles[angleIndex]);

+                    if (sides == 3)

+                        normals.Add(normals3[angleIndex]);

+                    else if (sides == 4)

+                        normals.Add(normals4[angleIndex]);

+                }

+

+                if (startAngle > 0.0f)

+                    angles[0] = interpolatePoints(startAngle, angles[0], angles[1]);

+

+                if (stopAngle < 1.0f)

+                {

+                    int lastAngleIndex = angles.Count - 1;

+                    angles[lastAngleIndex] = interpolatePoints(stopAngle, angles[lastAngleIndex - 1], angles[lastAngleIndex]);

+                }

+            }

+            else

+            {

+                double stepSize = twoPi / sides;

+

+                int startStep = (int)(startAngle / stepSize);

+                double angle = stepSize * startStep;

+                int step = startStep;

+                double stopAngleTest = stopAngle;

+                if (stopAngle < twoPi)

+                {

+                    stopAngleTest = stepSize * ((int)(stopAngle / stepSize) + 1);

+                    if (stopAngleTest < stopAngle)

+                        stopAngleTest += stepSize;

+                    if (stopAngleTest > twoPi)

+                        stopAngleTest = twoPi;

+                }

+

+                while (angle <= stopAngleTest)

+                {

+                    Angle newAngle;

+                    newAngle.angle = (float)angle;

+                    newAngle.X = (float)System.Math.Cos(angle);

+                    newAngle.Y = (float)System.Math.Sin(angle);

+                    angles.Add(newAngle);

+                    step += 1;

+                    angle = stepSize * step;

+                }

+

+                if (startAngle > angles[0].angle)

+                {

+                    Angle newAngle;

+                    intersection(angles[0].X, angles[0].Y, angles[1].X, angles[1].Y, 0.0f, 0.0f, (float)Math.Cos(startAngle), (float)Math.Sin(startAngle));

+                    newAngle.angle = startAngle;

+                    newAngle.X = iX;

+                    newAngle.Y = iY;

+                    angles[0] = newAngle;

+                }

+

+                int index = angles.Count - 1;

+                if (stopAngle < angles[index].angle)

+                {

+                    Angle newAngle;

+                    intersection(angles[index - 1].X, angles[index - 1].Y, angles[index].X, angles[index].Y, 0.0f, 0.0f, (float)Math.Cos(stopAngle), (float)Math.Sin(stopAngle));

+                    newAngle.angle = stopAngle;

+                    newAngle.X = iX;

+                    newAngle.Y = iY;

+                    angles[index] = newAngle;

+                }

+            }

+        }

+    }

+

+    /// <summary>

+    /// generates a profile for extrusion

+    /// </summary>

+    internal class Profile

+    {

+        private const float twoPi = 2.0f * (float)Math.PI;

+

+        internal string errorMessage = null;

+

+        internal List<Coord> coords;

+        internal List<Face> faces;

+        internal List<Coord> vertexNormals;

+        internal List<float> us;

+        internal List<UVCoord> faceUVs;

+        internal List<int> faceNumbers;

+

+        // use these for making individual meshes for each prim face

+        internal List<int> outerCoordIndices = null;

+        internal List<int> hollowCoordIndices = null;

+        internal List<int> cut1CoordIndices = null;

+        internal List<int> cut2CoordIndices = null;

+

+        internal Coord faceNormal = new Coord(0.0f, 0.0f, 1.0f);

+        internal Coord cutNormal1 = new Coord();

+        internal Coord cutNormal2 = new Coord();

+

+        internal int numOuterVerts = 0;

+        internal int numHollowVerts = 0;

+

+        internal bool calcVertexNormals = false;

+        internal int bottomFaceNumber = 0;

+        internal int numPrimFaces = 0;

+

+        internal Profile()

+        {

+            this.coords = new List<Coord>();

+            this.faces = new List<Face>();

+            this.vertexNormals = new List<Coord>();

+            this.us = new List<float>();

+            this.faceUVs = new List<UVCoord>();

+            this.faceNumbers = new List<int>();

+        }

+

+        internal Profile(int sides, float profileStart, float profileEnd, float hollow, int hollowSides, bool createFaces, bool calcVertexNormals)

+        {

+            this.calcVertexNormals = calcVertexNormals;

+            this.coords = new List<Coord>();

+            this.faces = new List<Face>();

+            this.vertexNormals = new List<Coord>();

+            this.us = new List<float>();

+            this.faceUVs = new List<UVCoord>();

+            this.faceNumbers = new List<int>();

+

+            Coord center = new Coord(0.0f, 0.0f, 0.0f);

+            //bool hasCenter = false;

+

+            List<Coord> hollowCoords = new List<Coord>();

+            List<Coord> hollowNormals = new List<Coord>();

+            List<float> hollowUs = new List<float>();

+

+            if (calcVertexNormals)

+            {

+                this.outerCoordIndices = new List<int>();

+                this.hollowCoordIndices = new List<int>();

+                this.cut1CoordIndices = new List<int>();

+                this.cut2CoordIndices = new List<int>();

+            }

+

+            bool hasHollow = (hollow > 0.0f);

+

+            bool hasProfileCut = (profileStart > 0.0f || profileEnd < 1.0f);

+

+            AngleList angles = new AngleList();

+            AngleList hollowAngles = new AngleList();

+

+            float xScale = 0.5f;

+            float yScale = 0.5f;

+            if (sides == 4)  // corners of a square are sqrt(2) from center

+            {

+                xScale = 0.707f;

+                yScale = 0.707f;

+            }

+

+            float startAngle = profileStart * twoPi;

+            float stopAngle = profileEnd * twoPi;

+

+            try { angles.makeAngles(sides, startAngle, stopAngle); }

+            catch (Exception ex)

+            {

+

+                errorMessage = "makeAngles failed: Exception: " + ex.ToString()

+                + "\nsides: " + sides.ToString() + " startAngle: " + startAngle.ToString() + " stopAngle: " + stopAngle.ToString();

+

+                return;

+            }

+

+            this.numOuterVerts = angles.angles.Count;

+

+            // flag to create as few triangles as possible for 3 or 4 side profile

+            bool simpleFace = (sides < 5 && !hasHollow && !hasProfileCut);

+

+            if (hasHollow)

+            {

+                if (sides == hollowSides)

+                    hollowAngles = angles;

+                else

+                {

+                    try { hollowAngles.makeAngles(hollowSides, startAngle, stopAngle); }

+                    catch (Exception ex)

+                    {

+                        errorMessage = "makeAngles failed: Exception: " + ex.ToString()

+                        + "\nsides: " + sides.ToString() + " startAngle: " + startAngle.ToString() + " stopAngle: " + stopAngle.ToString();

+

+                        return;

+                    }

+                }

+                this.numHollowVerts = hollowAngles.angles.Count;

+            }

+            else if (!simpleFace)

+            {

+                this.coords.Add(center);

+                //hasCenter = true;

+                if (this.calcVertexNormals)

+                    this.vertexNormals.Add(new Coord(0.0f, 0.0f, 1.0f));

+                this.us.Add(0.0f);

+            }

+

+            float z = 0.0f;

+

+            Angle angle;

+            Coord newVert = new Coord();

+            if (hasHollow && hollowSides != sides)

+            {

+                int numHollowAngles = hollowAngles.angles.Count;

+                for (int i = 0; i < numHollowAngles; i++)

+                {

+                    angle = hollowAngles.angles[i];

+                    newVert.X = hollow * xScale * angle.X;

+                    newVert.Y = hollow * yScale * angle.Y;

+                    newVert.Z = z;

+

+                    hollowCoords.Add(newVert);

+                    if (this.calcVertexNormals)

+                    {

+                        if (hollowSides < 5)

+                            hollowNormals.Add(hollowAngles.normals[i].Invert());

+                        else

+                            hollowNormals.Add(new Coord(-angle.X, -angle.Y, 0.0f));

+

+                        hollowUs.Add(angle.angle * hollow);

+                    }

+                }

+            }

+

+            int index = 0;

+            int numAngles = angles.angles.Count;

+

+            for (int i = 0; i < numAngles; i++)

+            {

+                angle = angles.angles[i];

+                newVert.X = angle.X * xScale;

+                newVert.Y = angle.Y * yScale;

+                newVert.Z = z;

+                this.coords.Add(newVert);

+                if (this.calcVertexNormals)

+                {

+                    this.outerCoordIndices.Add(this.coords.Count - 1);

+

+                    if (sides < 5)

+                    {

+                        this.vertexNormals.Add(angles.normals[i]);

+                        float u = angle.angle;

+                        this.us.Add(u);

+                    }

+                    else

+                    {

+                        this.vertexNormals.Add(new Coord(angle.X, angle.Y, 0.0f));

+                        this.us.Add(angle.angle);

+                    }

+                }

+

+                if (hasHollow)

+                {

+                    if (hollowSides == sides)

+                    {

+                        newVert.X *= hollow;

+                        newVert.Y *= hollow;

+                        newVert.Z = z;

+                        hollowCoords.Add(newVert);

+                        if (this.calcVertexNormals)

+                        {

+                            if (sides < 5)

+                            {

+                                hollowNormals.Add(angles.normals[i].Invert());

+                            }

+

+                            else

+                                hollowNormals.Add(new Coord(-angle.X, -angle.Y, 0.0f));

+

+                            hollowUs.Add(angle.angle * hollow);

+                        }

+                    }

+                }

+                else if (!simpleFace && createFaces && angle.angle > 0.0001f)

+                {

+                    Face newFace = new Face();

+                    newFace.v1 = 0;

+                    newFace.v2 = index;

+                    newFace.v3 = index + 1;

+

+                    this.faces.Add(newFace);

+                }

+                index += 1;

+            }

+

+            if (hasHollow)

+            {

+                hollowCoords.Reverse();

+                if (this.calcVertexNormals)

+                {

+                    hollowNormals.Reverse();

+                    hollowUs.Reverse();

+                }

+

+                if (createFaces)

+                {

+                    //int numOuterVerts = this.coords.Count;

+                    //numOuterVerts = this.coords.Count;

+                    //int numHollowVerts = hollowCoords.Count;

+                    int numTotalVerts = this.numOuterVerts + this.numHollowVerts;

+

+                    if (this.numOuterVerts == this.numHollowVerts)

+                    {

+                        Face newFace = new Face();

+

+                        for (int coordIndex = 0; coordIndex < this.numOuterVerts - 1; coordIndex++)

+                        {

+                            newFace.v1 = coordIndex;

+                            newFace.v2 = coordIndex + 1;

+                            newFace.v3 = numTotalVerts - coordIndex - 1;

+                            this.faces.Add(newFace);

+

+                            newFace.v1 = coordIndex + 1;

+                            newFace.v2 = numTotalVerts - coordIndex - 2;

+                            newFace.v3 = numTotalVerts - coordIndex - 1;

+                            this.faces.Add(newFace);

+                        }

+                    }

+                    else

+                    {

+                        if (this.numOuterVerts < this.numHollowVerts)

+                        {

+                            Face newFace = new Face();

+                            int j = 0; // j is the index for outer vertices

+                            int maxJ = this.numOuterVerts - 1;

+                            for (int i = 0; i < this.numHollowVerts; i++) // i is the index for inner vertices

+                            {

+                                if (j < maxJ)

+                                    if (angles.angles[j + 1].angle - hollowAngles.angles[i].angle < hollowAngles.angles[i].angle - angles.angles[j].angle + 0.000001f)

+                                    {

+                                        newFace.v1 = numTotalVerts - i - 1;

+                                        newFace.v2 = j;

+                                        newFace.v3 = j + 1;

+

+                                        this.faces.Add(newFace);

+                                        j += 1;

+                                    }

+

+                                newFace.v1 = j;

+                                newFace.v2 = numTotalVerts - i - 2;

+                                newFace.v3 = numTotalVerts - i - 1;

+

+                                this.faces.Add(newFace);

+                            }

+                        }

+                        else // numHollowVerts < numOuterVerts

+                        {

+                            Face newFace = new Face();

+                            int j = 0; // j is the index for inner vertices

+                            int maxJ = this.numHollowVerts - 1;

+                            for (int i = 0; i < this.numOuterVerts; i++)

+                            {

+                                if (j < maxJ)

+                                    if (hollowAngles.angles[j + 1].angle - angles.angles[i].angle < angles.angles[i].angle - hollowAngles.angles[j].angle + 0.000001f)

+                                    {

+                                        newFace.v1 = i;

+                                        newFace.v2 = numTotalVerts - j - 2;

+                                        newFace.v3 = numTotalVerts - j - 1;

+

+                                        this.faces.Add(newFace);

+                                        j += 1;

+                                    }

+

+                                newFace.v1 = numTotalVerts - j - 1;

+                                newFace.v2 = i;

+                                newFace.v3 = i + 1;

+

+                                this.faces.Add(newFace);

+                            }

+                        }

+                    }

+                }

+

+                if (calcVertexNormals)

+                {

+                    foreach (Coord hc in hollowCoords)

+                    {

+                        this.coords.Add(hc);

+                        hollowCoordIndices.Add(this.coords.Count - 1);

+                    }

+                }

+                else

+                    this.coords.AddRange(hollowCoords);

+

+                if (this.calcVertexNormals)

+                {

+                    this.vertexNormals.AddRange(hollowNormals);

+                    this.us.AddRange(hollowUs);

+

+                }

+            }

+

+            if (simpleFace && createFaces)

+            {

+                if (sides == 3)

+                    this.faces.Add(new Face(0, 1, 2));

+                else if (sides == 4)

+                {

+                    this.faces.Add(new Face(0, 1, 2));

+                    this.faces.Add(new Face(0, 2, 3));

+                }

+            }

+

+            if (calcVertexNormals && hasProfileCut)

+            {

+                if (hasHollow)

+                {

+                    int lastOuterVertIndex = this.numOuterVerts - 1;

+

+                    this.cut1CoordIndices.Add(0);

+                    this.cut1CoordIndices.Add(this.coords.Count - 1);

+

+                    this.cut2CoordIndices.Add(lastOuterVertIndex + 1);

+                    this.cut2CoordIndices.Add(lastOuterVertIndex);

+

+                    this.cutNormal1.X = this.coords[0].Y - this.coords[this.coords.Count - 1].Y;

+                    this.cutNormal1.Y = -(this.coords[0].X - this.coords[this.coords.Count - 1].X);

+

+                    this.cutNormal2.X = this.coords[lastOuterVertIndex + 1].Y - this.coords[lastOuterVertIndex].Y;

+                    this.cutNormal2.Y = -(this.coords[lastOuterVertIndex + 1].X - this.coords[lastOuterVertIndex].X);

+                }

+

+                else

+                {

+                    this.cutNormal1.X = this.vertexNormals[1].Y;

+                    this.cutNormal1.Y = -this.vertexNormals[1].X;

+

+                    this.cutNormal2.X = -this.vertexNormals[this.vertexNormals.Count - 2].Y;

+                    this.cutNormal2.Y = this.vertexNormals[this.vertexNormals.Count - 2].X;

+

+                }

+                this.cutNormal1.Normalize();

+                this.cutNormal2.Normalize();

+            }

+

+            this.MakeFaceUVs();

+

+            hollowCoords = null;

+            hollowNormals = null;

+            hollowUs = null;

+

+            if (calcVertexNormals)

+            { // calculate prim face numbers

+

+                // face number order is top, outer, hollow, bottom, start cut, end cut

+                // I know it's ugly but so is the whole concept of prim face numbers

+

+                int faceNum = 1; // start with outer faces

+                int startVert = hasProfileCut && !hasHollow ? 1 : 0;

+                if (startVert > 0)

+                    this.faceNumbers.Add(-1);

+                for (int i = 0; i < this.numOuterVerts - 1; i++)

+                    this.faceNumbers.Add(sides < 5 ? faceNum++ : faceNum);

+

+                //if (!hasHollow && !hasProfileCut)

+                //    this.bottomFaceNumber = faceNum++;

+

+                this.faceNumbers.Add(hasProfileCut ? -1 : faceNum++);

+

+                if (sides > 4 && (hasHollow || hasProfileCut))

+                    faceNum++;

+

+                if (hasHollow)

+                {

+                    for (int i = 0; i < this.numHollowVerts; i++)

+                        this.faceNumbers.Add(faceNum);

+

+                    faceNum++;

+                }

+                //if (hasProfileCut || hasHollow)

+                //    this.bottomFaceNumber = faceNum++;

+                this.bottomFaceNumber = faceNum++;

+

+                if (hasHollow && hasProfileCut)

+                    this.faceNumbers.Add(faceNum++);

+                for (int i = 0; i < this.faceNumbers.Count; i++)

+                    if (this.faceNumbers[i] == -1)

+                        this.faceNumbers[i] = faceNum++;

+

+

+                this.numPrimFaces = faceNum;

+            }

+

+        }

+

+        internal void MakeFaceUVs()

+        {

+            this.faceUVs = new List<UVCoord>();

+            foreach (Coord c in this.coords)

+                this.faceUVs.Add(new UVCoord(0.5f + c.X, 0.5f - c.Y));

+        }

+

+        internal Profile Copy()

+        {

+            return this.Copy(true);

+        }

+

+        internal Profile Copy(bool needFaces)

+        {

+            Profile copy = new Profile();

+

+            copy.coords.AddRange(this.coords);

+            copy.faceUVs.AddRange(this.faceUVs);

+

+            if (needFaces)

+                copy.faces.AddRange(this.faces);

+            if ((copy.calcVertexNormals = this.calcVertexNormals) == true)

+            {

+                copy.vertexNormals.AddRange(this.vertexNormals);

+                copy.faceNormal = this.faceNormal;

+                copy.cutNormal1 = this.cutNormal1;

+                copy.cutNormal2 = this.cutNormal2;

+                copy.us.AddRange(this.us);

+                copy.faceNumbers.AddRange(this.faceNumbers);

+

+                copy.cut1CoordIndices = new List<int>(this.cut1CoordIndices);

+                copy.cut2CoordIndices = new List<int>(this.cut2CoordIndices);

+                copy.hollowCoordIndices = new List<int>(this.hollowCoordIndices);

+                copy.outerCoordIndices = new List<int>(this.outerCoordIndices);

+            }

+            copy.numOuterVerts = this.numOuterVerts;

+            copy.numHollowVerts = this.numHollowVerts;

+

+            return copy;

+        }

+

+        internal void AddPos(Coord v)

+        {

+            this.AddPos(v.X, v.Y, v.Z);

+        }

+

+        internal void AddPos(float x, float y, float z)

+        {

+            int i;

+            int numVerts = this.coords.Count;

+            Coord vert;

+

+            for (i = 0; i < numVerts; i++)

+            {

+                vert = this.coords[i];

+                vert.X += x;

+                vert.Y += y;

+                vert.Z += z;

+                this.coords[i] = vert;

+            }

+        }

+

+        internal void AddRot(Quat q)

+        {

+            int i;

+            int numVerts = this.coords.Count;

+

+            for (i = 0; i < numVerts; i++)

+                this.coords[i] *= q;

+

+            if (this.calcVertexNormals)

+            {

+                int numNormals = this.vertexNormals.Count;

+                for (i = 0; i < numNormals; i++)

+                    this.vertexNormals[i] *= q;

+

+                this.faceNormal *= q;

+                this.cutNormal1 *= q;

+                this.cutNormal2 *= q;

+

+            }

+        }

+

+        internal void Scale(float x, float y)

+        {

+            int i;

+            int numVerts = this.coords.Count;

+            Coord vert;

+

+            for (i = 0; i < numVerts; i++)

+            {

+                vert = this.coords[i];

+                vert.X *= x;

+                vert.Y *= y;

+                this.coords[i] = vert;

+            }

+        }

+

+        /// <summary>

+        /// Changes order of the vertex indices and negates the center vertex normal. Does not alter vertex normals of radial vertices

+        /// </summary>

+        internal void FlipNormals()

+        {

+            int i;

+            int numFaces = this.faces.Count;

+            Face tmpFace;

+            int tmp;

+

+            for (i = 0; i < numFaces; i++)

+            {

+                tmpFace = this.faces[i];

+                tmp = tmpFace.v3;

+                tmpFace.v3 = tmpFace.v1;

+                tmpFace.v1 = tmp;

+                this.faces[i] = tmpFace;

+            }

+

+            if (this.calcVertexNormals)

+            {

+                int normalCount = this.vertexNormals.Count;

+                if (normalCount > 0)

+                {

+                    Coord n = this.vertexNormals[normalCount - 1];

+                    n.Z = -n.Z;

+                    this.vertexNormals[normalCount - 1] = n;

+                }

+            }

+

+            this.faceNormal.X = -this.faceNormal.X;

+            this.faceNormal.Y = -this.faceNormal.Y;

+            this.faceNormal.Z = -this.faceNormal.Z;

+

+            int numfaceUVs = this.faceUVs.Count;

+            for (i = 0; i < numfaceUVs; i++)

+            {

+                UVCoord uv = this.faceUVs[i];

+                uv.V = 1.0f - uv.V;

+                this.faceUVs[i] = uv;

+            }

+        }

+

+        internal void AddValue2FaceVertexIndices(int num)

+        {

+            int numFaces = this.faces.Count;

+            Face tmpFace;

+            for (int i = 0; i < numFaces; i++)

+            {

+                tmpFace = this.faces[i];

+                tmpFace.v1 += num;

+                tmpFace.v2 += num;

+                tmpFace.v3 += num;

+

+                this.faces[i] = tmpFace;

+            }

+        }

+

+        internal void AddValue2FaceNormalIndices(int num)

+        {

+            if (this.calcVertexNormals)

+            {

+                int numFaces = this.faces.Count;

+                Face tmpFace;

+                for (int i = 0; i < numFaces; i++)

+                {

+                    tmpFace = this.faces[i];

+                    tmpFace.n1 += num;

+                    tmpFace.n2 += num;

+                    tmpFace.n3 += num;

+

+                    this.faces[i] = tmpFace;

+                }

+            }

+        }

+

+        internal void DumpRaw(String path, String name, String title)

+        {

+            if (path == null)

+                return;

+            String fileName = name + "_" + title + ".raw";

+            String completePath = System.IO.Path.Combine(path, fileName);

+            StreamWriter sw = new StreamWriter(completePath);

+

+            for (int i = 0; i < this.faces.Count; i++)

+            {

+                string s = this.coords[this.faces[i].v1].ToString();

+                s += " " + this.coords[this.faces[i].v2].ToString();

+                s += " " + this.coords[this.faces[i].v3].ToString();

+

+                sw.WriteLine(s);

+            }

+

+            sw.Close();

+        }

+    }

+

+    public struct PathNode

+    {

+        public Coord position;

+        public Quat rotation;

+        public float xScale;

+        public float yScale;

+        public float percentOfPath;

+    }

+

+    public enum PathType { Linear = 0, Circular = 1, Flexible = 2 }

+

+    public class Path

+    {

+        public List<PathNode> pathNodes = new List<PathNode>();

+

+        public float twistBegin = 0.0f;

+        public float twistEnd = 0.0f;

+        public float topShearX = 0.0f;

+        public float topShearY = 0.0f;

+        public float pathCutBegin = 0.0f;

+        public float pathCutEnd = 1.0f;

+        public float dimpleBegin = 0.0f;

+        public float dimpleEnd = 1.0f;

+        public float skew = 0.0f;

+        public float holeSizeX = 1.0f; // called pathScaleX in pbs

+        public float holeSizeY = 0.25f;

+        public float taperX = 0.0f;

+        public float taperY = 0.0f;

+        public float radius = 0.0f;

+        public float revolutions = 1.0f;

+        public int stepsPerRevolution = 24;

+

+        private const float twoPi = 2.0f * (float)Math.PI;

+

+        public void Create(PathType pathType, int steps)

+        {

+            if (pathType == PathType.Linear || pathType == PathType.Flexible)

+            {

+                int step = 0;

+

+                float length = this.pathCutEnd - this.pathCutBegin;

+                float twistTotal = twistEnd - twistBegin;

+                float twistTotalAbs = Math.Abs(twistTotal);

+                if (twistTotalAbs > 0.01f)

+                    steps += (int)(twistTotalAbs * 3.66); //  dahlia's magic number

+

+                float start = -0.5f;

+                float stepSize = length / (float)steps;

+                float percentOfPathMultiplier = stepSize;

+                float xOffset = 0.0f;

+                float yOffset = 0.0f;

+                float zOffset = start;

+                float xOffsetStepIncrement = this.topShearX / steps;

+                float yOffsetStepIncrement = this.topShearY / steps;

+

+                float percentOfPath = this.pathCutBegin;

+                zOffset += percentOfPath;

+

+                // sanity checks

+

+                bool done = false;

+

+                while (!done)

+                {

+                    PathNode newNode = new PathNode();

+

+                    newNode.xScale = 1.0f;

+                    if (this.taperX == 0.0f)

+                        newNode.xScale = 1.0f;

+                    else if (this.taperX > 0.0f)

+                        newNode.xScale = 1.0f - percentOfPath * this.taperX;

+                    else newNode.xScale = 1.0f + (1.0f - percentOfPath) * this.taperX;

+

+                    newNode.yScale = 1.0f;

+                    if (this.taperY == 0.0f)

+                        newNode.yScale = 1.0f;

+                    else if (this.taperY > 0.0f)

+                        newNode.yScale = 1.0f - percentOfPath * this.taperY;

+                    else newNode.yScale = 1.0f + (1.0f - percentOfPath) * this.taperY;

+

+                    float twist = twistBegin + twistTotal * percentOfPath;

+

+                    newNode.rotation = new Quat(new Coord(0.0f, 0.0f, 1.0f), twist);

+                    newNode.position = new Coord(xOffset, yOffset, zOffset);

+                    newNode.percentOfPath = percentOfPath;

+

+                    pathNodes.Add(newNode);

+

+                    if (step < steps)

+                    {

+                        step += 1;

+                        percentOfPath += percentOfPathMultiplier;

+                        xOffset += xOffsetStepIncrement;

+                        yOffset += yOffsetStepIncrement;

+                        zOffset += stepSize;

+                        if (percentOfPath > this.pathCutEnd)

+                            done = true;

+                    }

+                    else done = true;

+                }

+            } // end of linear path code

+

+            else // pathType == Circular

+            {

+                float twistTotal = twistEnd - twistBegin;

+

+                // if the profile has a lot of twist, add more layers otherwise the layers may overlap

+                // and the resulting mesh may be quite inaccurate. This method is arbitrary and doesn't

+                // accurately match the viewer

+                float twistTotalAbs = Math.Abs(twistTotal);

+                if (twistTotalAbs > 0.01f)

+                {

+                    if (twistTotalAbs > Math.PI * 1.5f)

+                        steps *= 2;

+                    if (twistTotalAbs > Math.PI * 3.0f)

+                        steps *= 2;

+                }

+

+                float yPathScale = this.holeSizeY * 0.5f;

+                float pathLength = this.pathCutEnd - this.pathCutBegin;

+                float totalSkew = this.skew * 2.0f * pathLength;

+                float skewStart = this.pathCutBegin * 2.0f * this.skew - this.skew;

+                float xOffsetTopShearXFactor = this.topShearX * (0.25f + 0.5f * (0.5f - this.holeSizeY));

+                float yShearCompensation = 1.0f + Math.Abs(this.topShearY) * 0.25f;

+

+                // It's not quite clear what pushY (Y top shear) does, but subtracting it from the start and end

+                // angles appears to approximate it's effects on path cut. Likewise, adding it to the angle used

+                // to calculate the sine for generating the path radius appears to approximate it's effects there

+                // too, but there are some subtle differences in the radius which are noticeable as the prim size

+                // increases and it may affect megaprims quite a bit. The effect of the Y top shear parameter on

+                // the meshes generated with this technique appear nearly identical in shape to the same prims when

+                // displayed by the viewer.

+

+                float startAngle = (twoPi * this.pathCutBegin * this.revolutions) - this.topShearY * 0.9f;

+                float endAngle = (twoPi * this.pathCutEnd * this.revolutions) - this.topShearY * 0.9f;

+                float stepSize = twoPi / this.stepsPerRevolution;

+

+                int step = (int)(startAngle / stepSize);

+                float angle = startAngle;

+

+                bool done = false;

+                while (!done) // loop through the length of the path and add the layers

+                {

+                    PathNode newNode = new PathNode();

+

+                    float xProfileScale = (1.0f - Math.Abs(this.skew)) * this.holeSizeX;

+                    float yProfileScale = this.holeSizeY;

+

+                    float percentOfPath = angle / (twoPi * this.revolutions);

+                    float percentOfAngles = (angle - startAngle) / (endAngle - startAngle);

+

+                    if (this.taperX > 0.01f)

+                        xProfileScale *= 1.0f - percentOfPath * this.taperX;

+                    else if (this.taperX < -0.01f)

+                        xProfileScale *= 1.0f + (1.0f - percentOfPath) * this.taperX;

+

+                    if (this.taperY > 0.01f)

+                        yProfileScale *= 1.0f - percentOfPath * this.taperY;

+                    else if (this.taperY < -0.01f)

+                        yProfileScale *= 1.0f + (1.0f - percentOfPath) * this.taperY;

+

+                    newNode.xScale = xProfileScale;

+                    newNode.yScale = yProfileScale;

+

+                    float radiusScale = 1.0f;

+                    if (this.radius > 0.001f)

+                        radiusScale = 1.0f - this.radius * percentOfPath;

+                    else if (this.radius < 0.001f)

+                        radiusScale = 1.0f + this.radius * (1.0f - percentOfPath);

+

+                    float twist = twistBegin + twistTotal * percentOfPath;

+

+                    float xOffset = 0.5f * (skewStart + totalSkew * percentOfAngles);

+                    xOffset += (float)Math.Sin(angle) * xOffsetTopShearXFactor;

+

+                    float yOffset = yShearCompensation * (float)Math.Cos(angle) * (0.5f - yPathScale) * radiusScale;

+

+                    float zOffset = (float)Math.Sin(angle + this.topShearY) * (0.5f - yPathScale) * radiusScale;

+

+                    newNode.position = new Coord(xOffset, yOffset, zOffset);

+

+                    // now orient the rotation of the profile layer relative to it's position on the path

+                    // adding taperY to the angle used to generate the quat appears to approximate the viewer

+

+                    newNode.rotation = new Quat(new Coord(1.0f, 0.0f, 0.0f), angle + this.topShearY);

+

+                    // next apply twist rotation to the profile layer

+                    if (twistTotal != 0.0f || twistBegin != 0.0f)

+                        newNode.rotation *= new Quat(new Coord(0.0f, 0.0f, 1.0f), twist);

+

+                    newNode.percentOfPath = percentOfPath;

+

+                    pathNodes.Add(newNode);

+

+                    // calculate terms for next iteration

+                    // calculate the angle for the next iteration of the loop

+

+                    if (angle >= endAngle - 0.01)

+                        done = true;

+                    else

+                    {

+                        step += 1;

+                        angle = stepSize * step;

+                        if (angle > endAngle)

+                            angle = endAngle;

+                    }

+                }

+            }

+        }

+    }

+

+    public class PrimMesh

+    {

+        public string errorMessage = "";

+        private const float twoPi = 2.0f * (float)Math.PI;

+

+        public List<Coord> coords;

+        public List<Coord> normals;

+        public List<Face> faces;

+

+        public List<ViewerFace> viewerFaces;

+

+        private int sides = 4;

+        private int hollowSides = 4;

+        private float profileStart = 0.0f;

+        private float profileEnd = 1.0f;

+        private float hollow = 0.0f;

+        public int twistBegin = 0;

+        public int twistEnd = 0;

+        public float topShearX = 0.0f;

+        public float topShearY = 0.0f;

+        public float pathCutBegin = 0.0f;

+        public float pathCutEnd = 1.0f;

+        public float dimpleBegin = 0.0f;

+        public float dimpleEnd = 1.0f;

+        public float skew = 0.0f;

+        public float holeSizeX = 1.0f; // called pathScaleX in pbs

+        public float holeSizeY = 0.25f;

+        public float taperX = 0.0f;

+        public float taperY = 0.0f;

+        public float radius = 0.0f;

+        public float revolutions = 1.0f;

+        public int stepsPerRevolution = 24;

+

+        private bool hasProfileCut = false;

+        private bool hasHollow = false;

+        public bool calcVertexNormals = false;

+        private bool normalsProcessed = false;

+        public bool viewerMode = false;

+

+        public int numPrimFaces = 0;

+

+        /// <summary>

+        /// Human readable string representation of the parameters used to create a mesh.

+        /// </summary>

+        /// <returns></returns>

+        public string ParamsToDisplayString()

+        {

+            string s = "";

+            s += "sides..................: " + this.sides.ToString();

+            s += "\nhollowSides..........: " + this.hollowSides.ToString();

+            s += "\nprofileStart.........: " + this.profileStart.ToString();

+            s += "\nprofileEnd...........: " + this.profileEnd.ToString();

+            s += "\nhollow...............: " + this.hollow.ToString();

+            s += "\ntwistBegin...........: " + this.twistBegin.ToString();

+            s += "\ntwistEnd.............: " + this.twistEnd.ToString();

+            s += "\ntopShearX............: " + this.topShearX.ToString();

+            s += "\ntopShearY............: " + this.topShearY.ToString();

+            s += "\npathCutBegin.........: " + this.pathCutBegin.ToString();

+            s += "\npathCutEnd...........: " + this.pathCutEnd.ToString();

+            s += "\ndimpleBegin..........: " + this.dimpleBegin.ToString();

+            s += "\ndimpleEnd............: " + this.dimpleEnd.ToString();

+            s += "\nskew.................: " + this.skew.ToString();

+            s += "\nholeSizeX............: " + this.holeSizeX.ToString();

+            s += "\nholeSizeY............: " + this.holeSizeY.ToString();

+            s += "\ntaperX...............: " + this.taperX.ToString();

+            s += "\ntaperY...............: " + this.taperY.ToString();

+            s += "\nradius...............: " + this.radius.ToString();

+            s += "\nrevolutions..........: " + this.revolutions.ToString();

+            s += "\nstepsPerRevolution...: " + this.stepsPerRevolution.ToString();

+

+            return s;

+        }

+

+        /// <summary>

+        /// Constructs a PrimMesh object and creates the profile for extrusion.

+        /// </summary>

+        /// <param name="sides"></param>

+        /// <param name="profileStart"></param>

+        /// <param name="profileEnd"></param>

+        /// <param name="hollow"></param>

+        /// <param name="hollowSides"></param>

+        public PrimMesh(int sides, float profileStart, float profileEnd, float hollow, int hollowSides)

+        {

+            this.coords = new List<Coord>();

+            this.faces = new List<Face>();

+

+            this.sides = sides;

+            this.profileStart = profileStart;

+            this.profileEnd = profileEnd;

+            this.hollow = hollow;

+            this.hollowSides = hollowSides;

+

+            if (sides < 3)

+                this.sides = 3;

+            if (hollowSides < 3)

+                this.hollowSides = 3;

+            if (profileStart < 0.0f)

+                this.profileStart = 0.0f;

+            if (profileEnd > 1.0f)

+                this.profileEnd = 1.0f;

+            if (profileEnd < 0.02f)

+                this.profileEnd = 0.02f;

+            if (profileStart >= profileEnd)

+                this.profileStart = profileEnd - 0.02f;

+            if (hollow > 0.99f)

+                this.hollow = 0.99f;

+            if (hollow < 0.0f)

+                this.hollow = 0.0f;

+

+            this.hasProfileCut = (this.profileStart > 0.0f || this.profileEnd < 1.0f);

+            this.hasHollow = (this.hollow > 0.001f);

+        }

+

+        /// <summary>

+        /// Extrudes a profile along a path.

+        /// </summary>

+        public void Extrude(PathType pathType)

+        {

+            this.coords = new List<Coord>();

+            this.faces = new List<Face>();

+

+            if (this.viewerMode)

+            {

+                this.viewerFaces = new List<ViewerFace>();

+                this.calcVertexNormals = true;

+            }

+

+            if (this.calcVertexNormals)

+                this.normals = new List<Coord>();

+

+            int steps = 1;

+

+            float length = this.pathCutEnd - this.pathCutBegin;

+            normalsProcessed = false;

+

+            if (this.viewerMode && this.sides == 3)

+            {

+                // prisms don't taper well so add some vertical resolution

+                // other prims may benefit from this but just do prisms for now

+                if (Math.Abs(this.taperX) > 0.01 || Math.Abs(this.taperY) > 0.01)

+                    steps = (int)(steps * 4.5 * length);

+            }

+

+

+            float twistBegin = this.twistBegin / 360.0f * twoPi;

+            float twistEnd = this.twistEnd / 360.0f * twoPi;

+            float twistTotal = twistEnd - twistBegin;

+            float twistTotalAbs = Math.Abs(twistTotal);

+            if (twistTotalAbs > 0.01f)

+                steps += (int)(twistTotalAbs * 3.66); //  dahlia's magic number

+

+            float hollow = this.hollow;

+

+            // sanity checks

+            float initialProfileRot = 0.0f;

+            if (pathType == PathType.Circular)

+            {

+                if (this.sides == 3)

+                {

+                    initialProfileRot = (float)Math.PI;

+                    if (this.hollowSides == 4)

+                    {

+                        if (hollow > 0.7f)

+                            hollow = 0.7f;

+                        hollow *= 0.707f;

+                    }

+                    else hollow *= 0.5f;

+                }

+                else if (this.sides == 4)

+                {

+                    initialProfileRot = 0.25f * (float)Math.PI;

+                    if (this.hollowSides != 4)

+                        hollow *= 0.707f;

+                }

+                else if (this.sides > 4)

+                {

+                    initialProfileRot = (float)Math.PI;

+                    if (this.hollowSides == 4)

+                    {

+                        if (hollow > 0.7f)

+                            hollow = 0.7f;

+                        hollow /= 0.7f;

+                    }

+                }

+            }

+            else

+            {

+                if (this.sides == 3)

+                {

+                    if (this.hollowSides == 4)

+                    {

+                        if (hollow > 0.7f)

+                            hollow = 0.7f;

+                        hollow *= 0.707f;

+                    }

+                    else hollow *= 0.5f;

+                }

+                else if (this.sides == 4)

+                {

+                    initialProfileRot = 1.25f * (float)Math.PI;

+                    if (this.hollowSides != 4)

+                        hollow *= 0.707f;

+                }

+                else if (this.sides == 24 && this.hollowSides == 4)

+                    hollow *= 1.414f;

+            }

+

+            Profile profile = new Profile(this.sides, this.profileStart, this.profileEnd, hollow, this.hollowSides, true, calcVertexNormals);

+            this.errorMessage = profile.errorMessage;

+

+            this.numPrimFaces = profile.numPrimFaces;

+

+            int cut1Vert = -1;

+            int cut2Vert = -1;

+            if (hasProfileCut)

+            {

+                cut1Vert = hasHollow ? profile.coords.Count - 1 : 0;

+                cut2Vert = hasHollow ? profile.numOuterVerts - 1 : profile.numOuterVerts;

+            }

+

+            if (initialProfileRot != 0.0f)

+            {

+                profile.AddRot(new Quat(new Coord(0.0f, 0.0f, 1.0f), initialProfileRot));

+                if (viewerMode)

+                    profile.MakeFaceUVs();

+            }

+

+            Coord lastCutNormal1 = new Coord();

+            Coord lastCutNormal2 = new Coord();

+            float lastV = 1.0f;

+

+            Path path = new Path();

+            path.twistBegin = twistBegin;

+            path.twistEnd = twistEnd;

+            path.topShearX = topShearX;

+            path.topShearY = topShearY;

+            path.pathCutBegin = pathCutBegin;

+            path.pathCutEnd = pathCutEnd;

+            path.dimpleBegin = dimpleBegin;

+            path.dimpleEnd = dimpleEnd;

+            path.skew = skew;

+            path.holeSizeX = holeSizeX;

+            path.holeSizeY = holeSizeY;

+            path.taperX = taperX;

+            path.taperY = taperY;

+            path.radius = radius;

+            path.revolutions = revolutions;

+            path.stepsPerRevolution = stepsPerRevolution;

+

+            path.Create(pathType, steps);

+

+            bool needEndFaces = false;

+            if (pathType == PathType.Circular)

+            {

+                needEndFaces = false;

+                if (this.pathCutBegin != 0.0f || this.pathCutEnd != 1.0f)

+                    needEndFaces = true;

+                else if (this.taperX != 0.0f || this.taperY != 0.0f)

+                    needEndFaces = true;

+                else if (this.skew != 0.0f)

+                    needEndFaces = true;

+                else if (twistTotal != 0.0f)

+                    needEndFaces = true;

+                else if (this.radius != 0.0f)

+                    needEndFaces = true;

+            }

+            else needEndFaces = true;

+

+            for (int nodeIndex = 0; nodeIndex < path.pathNodes.Count; nodeIndex++)

+            {

+                PathNode node = path.pathNodes[nodeIndex];

+                Profile newLayer = profile.Copy();

+                newLayer.Scale(node.xScale, node.yScale);

+

+                newLayer.AddRot(node.rotation);

+                newLayer.AddPos(node.position);

+

+                if (needEndFaces && nodeIndex == 0)

+                {

+                    newLayer.FlipNormals();

+

+                    // add the top faces to the viewerFaces list here

+                    if (this.viewerMode)

+                    {

+                        Coord faceNormal = newLayer.faceNormal;

+                        ViewerFace newViewerFace = new ViewerFace(profile.bottomFaceNumber);

+                        int numFaces = newLayer.faces.Count;

+                        List<Face> faces = newLayer.faces;

+

+                        for (int i = 0; i < numFaces; i++)

+                        {

+                            Face face = faces[i];

+                            newViewerFace.v1 = newLayer.coords[face.v1];

+                            newViewerFace.v2 = newLayer.coords[face.v2];

+                            newViewerFace.v3 = newLayer.coords[face.v3];

+

+                            newViewerFace.coordIndex1 = face.v1;

+                            newViewerFace.coordIndex2 = face.v2;

+                            newViewerFace.coordIndex3 = face.v3;

+

+                            newViewerFace.n1 = faceNormal;

+                            newViewerFace.n2 = faceNormal;

+                            newViewerFace.n3 = faceNormal;

+

+                            newViewerFace.uv1 = newLayer.faceUVs[face.v1];

+                            newViewerFace.uv2 = newLayer.faceUVs[face.v2];

+                            newViewerFace.uv3 = newLayer.faceUVs[face.v3];

+

+                            this.viewerFaces.Add(newViewerFace);

+                        }

+                    }

+                } // if (nodeIndex == 0)

+

+                // append this layer

+

+                int coordsLen = this.coords.Count;

+                newLayer.AddValue2FaceVertexIndices(coordsLen);

+

+                this.coords.AddRange(newLayer.coords);

+

+                if (this.calcVertexNormals)

+                {

+                    newLayer.AddValue2FaceNormalIndices(this.normals.Count);

+                    this.normals.AddRange(newLayer.vertexNormals);

+                }

+

+                if (node.percentOfPath < this.pathCutBegin + 0.01f || node.percentOfPath > this.pathCutEnd - 0.01f)

+                    this.faces.AddRange(newLayer.faces);

+

+                // fill faces between layers

+

+                int numVerts = newLayer.coords.Count;

+                Face newFace = new Face();

+

+                if (nodeIndex > 0)

+                {

+                    int startVert = coordsLen + 1;

+                    int endVert = this.coords.Count;

+

+                    if (sides < 5 || this.hasProfileCut || hollow > 0.0f)

+                        startVert--;

+

+                    for (int i = startVert; i < endVert; i++)

+                    {

+                        int iNext = i + 1;

+                        if (i == endVert - 1)

+                            iNext = startVert;

+

+                        int whichVert = i - startVert;

+

+                        newFace.v1 = i;

+                        newFace.v2 = i - numVerts;

+                        newFace.v3 = iNext - numVerts;

+                        this.faces.Add(newFace);

+

+                        newFace.v2 = iNext - numVerts;

+                        newFace.v3 = iNext;

+                        this.faces.Add(newFace);

+

+                        if (this.viewerMode)

+                        {

+                            // add the side faces to the list of viewerFaces here

+

+                            int primFaceNum = profile.faceNumbers[whichVert];

+                            if (!needEndFaces)

+                                primFaceNum -= 1;

+

+                            ViewerFace newViewerFace1 = new ViewerFace(primFaceNum);

+                            ViewerFace newViewerFace2 = new ViewerFace(primFaceNum);

+

+                            float u1 = newLayer.us[whichVert];

+                            float u2 = 1.0f;

+                            if (whichVert < newLayer.us.Count - 1)

+                                u2 = newLayer.us[whichVert + 1];

+

+                            if (whichVert == cut1Vert || whichVert == cut2Vert)

+                            {

+                                u1 = 0.0f;

+                                u2 = 1.0f;

+                            }

+                            else if (sides < 5)

+                            {

+                                if (whichVert < profile.numOuterVerts)

+                                { // boxes and prisms have one texture face per side of the prim, so the U values have to be scaled

+                                    // to reflect the entire texture width

+                                    u1 *= sides;

+                                    u2 *= sides;

+                                    u2 -= (int)u1;

+                                    u1 -= (int)u1;

+                                    if (u2 < 0.1f)

+                                        u2 = 1.0f;

+                                }

+                                else if (whichVert > profile.coords.Count - profile.numHollowVerts - 1)

+                                {

+                                    u1 *= 2.0f;

+                                    u2 *= 2.0f;

+                                }

+                            }

+

+                            newViewerFace1.uv1.U = u1;

+                            newViewerFace1.uv2.U = u1;

+                            newViewerFace1.uv3.U = u2;

+

+                            newViewerFace1.uv1.V = 1.0f - node.percentOfPath;

+                            newViewerFace1.uv2.V = lastV;

+                            newViewerFace1.uv3.V = lastV;

+

+                            newViewerFace2.uv1.U = u1;

+                            newViewerFace2.uv2.U = u2;

+                            newViewerFace2.uv3.U = u2;

+

+                            newViewerFace2.uv1.V = 1.0f - node.percentOfPath;

+                            newViewerFace2.uv2.V = lastV;

+                            newViewerFace2.uv3.V = 1.0f - node.percentOfPath;

+

+                            newViewerFace1.v1 = this.coords[i];

+                            newViewerFace1.v2 = this.coords[i - numVerts];

+                            newViewerFace1.v3 = this.coords[iNext - numVerts];

+

+                            newViewerFace2.v1 = this.coords[i];

+                            newViewerFace2.v2 = this.coords[iNext - numVerts];

+                            newViewerFace2.v3 = this.coords[iNext];

+

+                            newViewerFace1.coordIndex1 = i;

+                            newViewerFace1.coordIndex2 = i - numVerts;

+                            newViewerFace1.coordIndex3 = iNext - numVerts;

+

+                            newViewerFace2.coordIndex1 = i;

+                            newViewerFace2.coordIndex2 = iNext - numVerts;

+                            newViewerFace2.coordIndex3 = iNext;

+

+                            // profile cut faces

+                            if (whichVert == cut1Vert)

+                            {

+                                newViewerFace1.n1 = newLayer.cutNormal1;

+                                newViewerFace1.n2 = newViewerFace1.n3 = lastCutNormal1;

+

+                                newViewerFace2.n1 = newViewerFace2.n3 = newLayer.cutNormal1;

+                                newViewerFace2.n2 = lastCutNormal1;

+                            }

+                            else if (whichVert == cut2Vert)

+                            {

+                                newViewerFace1.n1 = newLayer.cutNormal2;

+                                newViewerFace1.n2 = newViewerFace1.n3 = lastCutNormal2;

+

+                                newViewerFace2.n1 = newViewerFace2.n3 = newLayer.cutNormal2;

+                                newViewerFace2.n2 = lastCutNormal2;

+                            }

+

+                            else // outer and hollow faces

+                            {

+                                if ((sides < 5 && whichVert < newLayer.numOuterVerts) || (hollowSides < 5 && whichVert >= newLayer.numOuterVerts))

+                                { // looks terrible when path is twisted... need vertex normals here

+                                    newViewerFace1.CalcSurfaceNormal();

+                                    newViewerFace2.CalcSurfaceNormal();

+                                }

+                                else

+                                {

+                                    newViewerFace1.n1 = this.normals[i];

+                                    newViewerFace1.n2 = this.normals[i - numVerts];

+                                    newViewerFace1.n3 = this.normals[iNext - numVerts];

+

+                                    newViewerFace2.n1 = this.normals[i];

+                                    newViewerFace2.n2 = this.normals[iNext - numVerts];

+                                    newViewerFace2.n3 = this.normals[iNext];

+                                }

+                            }

+

+                            this.viewerFaces.Add(newViewerFace1);

+                            this.viewerFaces.Add(newViewerFace2);

+

+                        }

+                    }

+                }

+

+                lastCutNormal1 = newLayer.cutNormal1;

+                lastCutNormal2 = newLayer.cutNormal2;

+                lastV = 1.0f - node.percentOfPath;

+

+                if (needEndFaces && nodeIndex == path.pathNodes.Count - 1 && viewerMode)

+                {

+                    // add the top faces to the viewerFaces list here

+                    Coord faceNormal = newLayer.faceNormal;

+                    ViewerFace newViewerFace = new ViewerFace();

+                    newViewerFace.primFaceNumber = 0;

+                    int numFaces = newLayer.faces.Count;

+                    List<Face> faces = newLayer.faces;

+

+                    for (int i = 0; i < numFaces; i++)

+                    {

+                        Face face = faces[i];

+                        newViewerFace.v1 = newLayer.coords[face.v1 - coordsLen];

+                        newViewerFace.v2 = newLayer.coords[face.v2 - coordsLen];

+                        newViewerFace.v3 = newLayer.coords[face.v3 - coordsLen];

+

+                        newViewerFace.coordIndex1 = face.v1 - coordsLen;

+                        newViewerFace.coordIndex2 = face.v2 - coordsLen;

+                        newViewerFace.coordIndex3 = face.v3 - coordsLen;

+

+                        newViewerFace.n1 = faceNormal;

+                        newViewerFace.n2 = faceNormal;

+                        newViewerFace.n3 = faceNormal;

+

+                        newViewerFace.uv1 = newLayer.faceUVs[face.v1 - coordsLen];

+                        newViewerFace.uv2 = newLayer.faceUVs[face.v2 - coordsLen];

+                        newViewerFace.uv3 = newLayer.faceUVs[face.v3 - coordsLen];

+

+                        this.viewerFaces.Add(newViewerFace);

+                    }

+                }

+

+

+            } // for (int nodeIndex = 0; nodeIndex < path.pathNodes.Count; nodeIndex++)

+

+        }

+

+

+        /// <summary>

+        /// DEPRICATED - use Extrude(PathType.Linear) instead

+        /// Extrudes a profile along a straight line path. Used for prim types box, cylinder, and prism.

+        /// </summary>

+        /// 

+        public void ExtrudeLinear()

+        {

+            this.Extrude(PathType.Linear);

+        }

+

+

+        /// <summary>

+        /// DEPRICATED - use Extrude(PathType.Circular) instead

+        /// Extrude a profile into a circular path prim mesh. Used for prim types torus, tube, and ring.

+        /// </summary>

+        /// 

+        public void ExtrudeCircular()

+        {

+            this.Extrude(PathType.Circular);

+        }

+

+

+        private Coord SurfaceNormal(Coord c1, Coord c2, Coord c3)

+        {

+            Coord edge1 = new Coord(c2.X - c1.X, c2.Y - c1.Y, c2.Z - c1.Z);

+            Coord edge2 = new Coord(c3.X - c1.X, c3.Y - c1.Y, c3.Z - c1.Z);

+

+            Coord normal = Coord.Cross(edge1, edge2);

+

+            normal.Normalize();

+

+            return normal;

+        }

+

+        private Coord SurfaceNormal(Face face)

+        {

+            return SurfaceNormal(this.coords[face.v1], this.coords[face.v2], this.coords[face.v3]);

+        }

+

+        /// <summary>

+        /// Calculate the surface normal for a face in the list of faces

+        /// </summary>

+        /// <param name="faceIndex"></param>

+        /// <returns></returns>

+        public Coord SurfaceNormal(int faceIndex)

+        {

+            int numFaces = this.faces.Count;

+            if (faceIndex < 0 || faceIndex >= numFaces)

+                throw new Exception("faceIndex out of range");

+

+            return SurfaceNormal(this.faces[faceIndex]);

+        }

+

+        /// <summary>

+        /// Duplicates a PrimMesh object. All object properties are copied by value, including lists.

+        /// </summary>

+        /// <returns></returns>

+        public PrimMesh Copy()

+        {

+            PrimMesh copy = new PrimMesh(this.sides, this.profileStart, this.profileEnd, this.hollow, this.hollowSides);

+            copy.twistBegin = this.twistBegin;

+            copy.twistEnd = this.twistEnd;

+            copy.topShearX = this.topShearX;

+            copy.topShearY = this.topShearY;

+            copy.pathCutBegin = this.pathCutBegin;

+            copy.pathCutEnd = this.pathCutEnd;

+            copy.dimpleBegin = this.dimpleBegin;

+            copy.dimpleEnd = this.dimpleEnd;

+            copy.skew = this.skew;

+            copy.holeSizeX = this.holeSizeX;

+            copy.holeSizeY = this.holeSizeY;

+            copy.taperX = this.taperX;

+            copy.taperY = this.taperY;

+            copy.radius = this.radius;

+            copy.revolutions = this.revolutions;

+            copy.stepsPerRevolution = this.stepsPerRevolution;

+            copy.calcVertexNormals = this.calcVertexNormals;

+            copy.normalsProcessed = this.normalsProcessed;

+            copy.viewerMode = this.viewerMode;

+            copy.numPrimFaces = this.numPrimFaces;

+            copy.errorMessage = this.errorMessage;

+

+            copy.coords = new List<Coord>(this.coords);

+            copy.faces = new List<Face>(this.faces);

+            copy.viewerFaces = new List<ViewerFace>(this.viewerFaces);

+            copy.normals = new List<Coord>(this.normals);

+

+            return copy;

+        }

+

+        /// <summary>

+        /// Calculate surface normals for all of the faces in the list of faces in this mesh

+        /// </summary>

+        public void CalcNormals()

+        {

+            if (normalsProcessed)

+                return;

+

+            normalsProcessed = true;

+

+            int numFaces = faces.Count;

+

+            if (!this.calcVertexNormals)

+                this.normals = new List<Coord>();

+

+            for (int i = 0; i < numFaces; i++)

+            {

+                Face face = faces[i];

+

+                this.normals.Add(SurfaceNormal(i).Normalize());

+

+                int normIndex = normals.Count - 1;

+                face.n1 = normIndex;

+                face.n2 = normIndex;

+                face.n3 = normIndex;

+

+                this.faces[i] = face;

+            }

+        }

+

+        /// <summary>

+        /// Adds a value to each XYZ vertex coordinate in the mesh

+        /// </summary>

+        /// <param name="x"></param>

+        /// <param name="y"></param>

+        /// <param name="z"></param>

+        public void AddPos(float x, float y, float z)

+        {

+            int i;

+            int numVerts = this.coords.Count;

+            Coord vert;

+

+            for (i = 0; i < numVerts; i++)

+            {

+                vert = this.coords[i];

+                vert.X += x;

+                vert.Y += y;

+                vert.Z += z;

+                this.coords[i] = vert;

+            }

+

+            if (this.viewerFaces != null)

+            {

+                int numViewerFaces = this.viewerFaces.Count;

+

+                for (i = 0; i < numViewerFaces; i++)

+                {

+                    ViewerFace v = this.viewerFaces[i];

+                    v.AddPos(x, y, z);

+                    this.viewerFaces[i] = v;

+                }

+            }

+        }

+

+        /// <summary>

+        /// Rotates the mesh

+        /// </summary>

+        /// <param name="q"></param>

+        public void AddRot(Quat q)

+        {

+            int i;

+            int numVerts = this.coords.Count;

+

+            for (i = 0; i < numVerts; i++)

+                this.coords[i] *= q;

+

+            if (this.normals != null)

+            {

+                int numNormals = this.normals.Count;

+                for (i = 0; i < numNormals; i++)

+                    this.normals[i] *= q;

+            }

+

+            if (this.viewerFaces != null)

+            {

+                int numViewerFaces = this.viewerFaces.Count;

+

+                for (i = 0; i < numViewerFaces; i++)

+                {

+                    ViewerFace v = this.viewerFaces[i];

+                    v.v1 *= q;

+                    v.v2 *= q;

+                    v.v3 *= q;

+

+                    v.n1 *= q;

+                    v.n2 *= q;

+                    v.n3 *= q;

+                    this.viewerFaces[i] = v;

+                }

+            }

+        }

+

+#if VERTEX_INDEXER

+        public VertexIndexer GetVertexIndexer()

+        {

+            if (this.viewerMode && this.viewerFaces.Count > 0)

+                return new VertexIndexer(this);

+            return null;

+        }

+#endif

+

+        /// <summary>

+        /// Scales the mesh

+        /// </summary>

+        /// <param name="x"></param>

+        /// <param name="y"></param>

+        /// <param name="z"></param>

+        public void Scale(float x, float y, float z)

+        {

+            int i;

+            int numVerts = this.coords.Count;

+            //Coord vert;

+

+            Coord m = new Coord(x, y, z);

+            for (i = 0; i < numVerts; i++)

+                this.coords[i] *= m;

+

+            if (this.viewerFaces != null)

+            {

+                int numViewerFaces = this.viewerFaces.Count;

+                for (i = 0; i < numViewerFaces; i++)

+                {

+                    ViewerFace v = this.viewerFaces[i];

+                    v.v1 *= m;

+                    v.v2 *= m;

+                    v.v3 *= m;

+                    this.viewerFaces[i] = v;

+                }

+

+            }

+

+        }

+

+        /// <summary>

+        /// Dumps the mesh to a Blender compatible "Raw" format file

+        /// </summary>

+        /// <param name="path"></param>

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

+        /// <param name="title"></param>

+        public void DumpRaw(String path, String name, String title)

+        {

+            if (path == null)

+                return;

+            String fileName = name + "_" + title + ".raw";

+            String completePath = System.IO.Path.Combine(path, fileName);

+            StreamWriter sw = new StreamWriter(completePath);

+

+            for (int i = 0; i < this.faces.Count; i++)

+            {

+                string s = this.coords[this.faces[i].v1].ToString();

+                s += " " + this.coords[this.faces[i].v2].ToString();

+                s += " " + this.coords[this.faces[i].v3].ToString();

+

+                sw.WriteLine(s);

+            }

+

+            sw.Close();

+        }

+    }

+}

diff --git a/OpenSim/Region/Physics/Meshing/SculptMesh.cs b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
index 4dc6e2e..11b6cd4 100644
--- a/OpenSim/Region/Physics/Meshing/SculptMesh.cs
+++ b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
@@ -1,627 +1,645 @@
-/*
- * Copyright (c) Contributors
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// to build without references to System.Drawing, comment this out
-#define SYSTEM_DRAWING
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-
-#if SYSTEM_DRAWING
-using System.Drawing;
-using System.Drawing.Imaging;
-#endif
-
-namespace PrimMesher
-{
-
-    public class SculptMesh
-    {
-        public List<Coord> coords;
-        public List<Face> faces;
-
-        public List<ViewerFace> viewerFaces;
-        public List<Coord> normals;
-        public List<UVCoord> uvs;
-
-        public enum SculptType { sphere = 1, torus = 2, plane = 3, cylinder = 4 };
-
-#if SYSTEM_DRAWING
-        // private Bitmap ScaleImage(Bitmap srcImage, float scale)
-        // {
-        //     int sourceWidth = srcImage.Width;
-        //     int sourceHeight = srcImage.Height;
-        //     int sourceX = 0;
-        //     int sourceY = 0;
-
-        //     int destX = 0;
-        //     int destY = 0;
-        //     int destWidth = (int)(srcImage.Width * scale);
-        //     int destHeight = (int)(srcImage.Height * scale);
-
-        //     if (srcImage.PixelFormat == PixelFormat.Format32bppArgb)
-        //         for (int y = 0; y < srcImage.Height; y++)
-        //             for (int x = 0; x < srcImage.Width; x++)
-        //             {
-        //                 Color c = srcImage.GetPixel(x, y);
-        //                 srcImage.SetPixel(x, y, Color.FromArgb(255, c.R, c.G, c.B));
-        //             }
-
-        //     Bitmap scaledImage = new Bitmap(destWidth, destHeight,
-        //                              PixelFormat.Format24bppRgb);
-
-        //     scaledImage.SetResolution(96.0f, 96.0f);
-
-        //     Graphics grPhoto = Graphics.FromImage(scaledImage);
-        //     grPhoto.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.Low;
-
-        //     grPhoto.DrawImage(srcImage,
-        //         new Rectangle(destX, destY, destWidth, destHeight),
-        //         new Rectangle(sourceX, sourceY, sourceWidth, sourceHeight),
-        //         GraphicsUnit.Pixel);
-
-        //     grPhoto.Dispose();
-        //     return scaledImage;
-        // }
-
-
-        public SculptMesh SculptMeshFromFile(string fileName, SculptType sculptType, int lod, bool viewerMode)
-        {
-            Bitmap bitmap = (Bitmap)Bitmap.FromFile(fileName);
-            SculptMesh sculptMesh = new SculptMesh(bitmap, sculptType, lod, viewerMode);
-            bitmap.Dispose();
-            return sculptMesh;
-        }
-
-        public SculptMesh(string fileName, int sculptType, int lod, int viewerMode, int mirror, int invert)
-        {
-            Bitmap bitmap = (Bitmap)Bitmap.FromFile(fileName);
-            _SculptMesh(bitmap, (SculptType)sculptType, lod, viewerMode != 0, mirror != 0, invert != 0);
-            bitmap.Dispose();
-        }
-#endif
-
-        /// <summary>
-        /// ** Experimental ** May disappear from future versions ** not recommeneded for use in applications
-        /// Construct a sculpt mesh from a 2D array of floats
-        /// </summary>
-        /// <param name="zMap"></param>
-        /// <param name="xBegin"></param>
-        /// <param name="xEnd"></param>
-        /// <param name="yBegin"></param>
-        /// <param name="yEnd"></param>
-        /// <param name="viewerMode"></param>
-        public SculptMesh(float[,] zMap, float xBegin, float xEnd, float yBegin, float yEnd, bool viewerMode)
-        {
-            float xStep, yStep;
-            float uStep, vStep;
-
-            int numYElements = zMap.GetLength(0);
-            int numXElements = zMap.GetLength(1);
-
-            try
-            {
-                xStep = (xEnd - xBegin) / (float)(numXElements - 1);
-                yStep = (yEnd - yBegin) / (float)(numYElements - 1);
-
-                uStep = 1.0f / (numXElements - 1);
-                vStep = 1.0f / (numYElements - 1);
-            }
-            catch (DivideByZeroException)
-            {
-                return;
-            }
-
-            coords = new List<Coord>();
-            faces = new List<Face>();
-            normals = new List<Coord>();
-            uvs = new List<UVCoord>();
-
-            viewerFaces = new List<ViewerFace>();
-
-            int p1, p2, p3, p4;
-
-            int x, y;
-            int xStart = 0, yStart = 0;
-
-            for (y = yStart; y < numYElements; y++)
-            {
-                int rowOffset = y * numXElements;
-
-                for (x = xStart; x < numXElements; x++)
-                {
-                    /*
-                    *   p1-----p2
-                    *   | \ f2 |
-                    *   |   \  |
-                    *   | f1  \|
-                    *   p3-----p4
-                    */
-
-                    p4 = rowOffset + x;
-                    p3 = p4 - 1;
-
-                    p2 = p4 - numXElements;
-                    p1 = p3 - numXElements;
-
-                    Coord c = new Coord(xBegin + x * xStep, yBegin + y * yStep, zMap[y, x]);
-                    this.coords.Add(c);
-                    if (viewerMode)
-                    {
-                        this.normals.Add(new Coord());
-                        this.uvs.Add(new UVCoord(uStep * x, 1.0f - vStep * y));
-                    }
-
-                    if (y > 0 && x > 0)
-                    {
-                        Face f1, f2;
-
-                        if (viewerMode)
-                        {
-                            f1 = new Face(p1, p4, p3, p1, p4, p3);
-                            f1.uv1 = p1;
-                            f1.uv2 = p4;
-                            f1.uv3 = p3;
-
-                            f2 = new Face(p1, p2, p4, p1, p2, p4);
-                            f2.uv1 = p1;
-                            f2.uv2 = p2;
-                            f2.uv3 = p4;
-                        }
-                        else
-                        {
-                            f1 = new Face(p1, p4, p3);
-                            f2 = new Face(p1, p2, p4);
-                        }
-
-                        this.faces.Add(f1);
-                        this.faces.Add(f2);
-                    }
-                }
-            }
-
-            if (viewerMode)
-                calcVertexNormals(SculptType.plane, numXElements, numYElements);
-        }
-
-#if SYSTEM_DRAWING
-        public SculptMesh(Bitmap sculptBitmap, SculptType sculptType, int lod, bool viewerMode)
-        {
-            _SculptMesh(sculptBitmap, sculptType, lod, viewerMode, false, false);
-        }
-
-        public SculptMesh(Bitmap sculptBitmap, SculptType sculptType, int lod, bool viewerMode, bool mirror, bool invert)
-        {
-            _SculptMesh(sculptBitmap, sculptType, lod, viewerMode, mirror, invert);
-        }
-#endif
-
-        public SculptMesh(List<List<Coord>> rows, SculptType sculptType, bool viewerMode, bool mirror, bool invert)
-        {
-            _SculptMesh(rows, sculptType, viewerMode, mirror, invert);
-        }
-
-#if SYSTEM_DRAWING
-        /// <summary>
-        /// converts a bitmap to a list of lists of coords, while scaling the image.
-        /// the scaling is done in floating point so as to allow for reduced vertex position
-        /// quantization as the position will be averaged between pixel values. this routine will
-        /// likely fail if the bitmap width and height are not powers of 2.
-        /// </summary>
-        /// <param name="bitmap"></param>
-        /// <param name="scale"></param>
-        /// <param name="mirror"></param>
-        /// <returns></returns>
-        private List<List<Coord>> bitmap2Coords(Bitmap bitmap, int scale, bool mirror)
-        {
-            int numRows = bitmap.Height / scale;
-            int numCols = bitmap.Width / scale;
-            List<List<Coord>> rows = new List<List<Coord>>(numRows);
-
-            float pixScale = 1.0f / (scale * scale);
-            pixScale /= 255;
-
-            int imageX, imageY = 0;
-
-            int rowNdx, colNdx;
-
-            for (rowNdx = 0; rowNdx < numRows; rowNdx++)
-            {
-                List<Coord> row = new List<Coord>(numCols);
-                for (colNdx = 0; colNdx < numCols; colNdx++)
-                {
-                    imageX = colNdx * scale;
-                    int imageYStart = rowNdx * scale;
-                    int imageYEnd = imageYStart + scale;
-                    int imageXEnd = imageX + scale;
-                    float rSum = 0.0f;
-                    float gSum = 0.0f;
-                    float bSum = 0.0f;
-                    for (; imageX < imageXEnd; imageX++)
-                    {
-                        for (imageY = imageYStart; imageY < imageYEnd; imageY++)
-                        {
-                            Color c = bitmap.GetPixel(imageX, imageY);
-                            rSum += c.R;
-                            gSum += c.G;
-                            bSum += c.B;
-                        }
-                    }
-                    if (mirror)
-                        row.Add(new Coord(-(rSum * pixScale - 0.5f), gSum * pixScale - 0.5f, bSum * pixScale - 0.5f));
-                    else
-                        row.Add(new Coord(rSum * pixScale - 0.5f, gSum * pixScale - 0.5f, bSum * pixScale - 0.5f));
-
-                }
-                rows.Add(row);
-            }
-            return rows;
-        }
-
-
-        void _SculptMesh(Bitmap sculptBitmap, SculptType sculptType, int lod, bool viewerMode, bool mirror, bool invert)
-        {
-            coords = new List<Coord>();
-            faces = new List<Face>();
-            normals = new List<Coord>();
-            uvs = new List<UVCoord>();
-
-            sculptType = (SculptType)(((int)sculptType) & 0x07);
-
-            if (mirror)
-                if (sculptType == SculptType.plane)
-                    invert = !invert;
-
-            float sourceScaleFactor = (float)(lod) / (float)Math.Sqrt(sculptBitmap.Width * sculptBitmap.Height);
-
-            int scale = (int)(1.0f / sourceScaleFactor);
-            if (scale < 1) scale = 1;
-
-            _SculptMesh(bitmap2Coords(sculptBitmap, scale, mirror), sculptType, viewerMode, mirror, invert);
-        }
-#endif
-
-
-        void _SculptMesh(List<List<Coord>> rows, SculptType sculptType, bool viewerMode, bool mirror, bool invert)
-        {
-            coords = new List<Coord>();
-            faces = new List<Face>();
-            normals = new List<Coord>();
-            uvs = new List<UVCoord>();
-
-            sculptType = (SculptType)(((int)sculptType) & 0x07);
-
-            if (mirror)
-                if (sculptType == SculptType.plane)
-                    invert = !invert;
-
-            viewerFaces = new List<ViewerFace>();
-
-            int width = rows[0].Count;
-
-            int p1, p2, p3, p4;
-
-            int imageX, imageY;
-
-            if (sculptType != SculptType.plane)
-            {
-                for (int rowNdx = 0; rowNdx < rows.Count; rowNdx++)
-                    rows[rowNdx].Add(rows[rowNdx][0]);
-            }
-
-            Coord topPole = rows[0][width / 2];
-            Coord bottomPole = rows[rows.Count - 1][width / 2];
-
-            if (sculptType == SculptType.sphere)
-            {
-                int count = rows[0].Count;
-                List<Coord> topPoleRow = new List<Coord>(count);
-                List<Coord> bottomPoleRow = new List<Coord>(count);
-
-                for (int i = 0; i < count; i++)
-                {
-                    topPoleRow.Add(topPole);
-                    bottomPoleRow.Add(bottomPole);
-                }
-                rows.Insert(0, topPoleRow);
-                rows.Add(bottomPoleRow);
-            }
-            else if (sculptType == SculptType.torus)
-                rows.Add(rows[0]);
-
-            int coordsDown = rows.Count;
-            int coordsAcross = rows[0].Count;
-
-            float widthUnit = 1.0f / (coordsAcross - 1);
-            float heightUnit = 1.0f / (coordsDown - 1);
-
-            for (imageY = 0; imageY < coordsDown; imageY++)
-            {
-                int rowOffset = imageY * coordsAcross;
-
-                for (imageX = 0; imageX < coordsAcross; imageX++)
-                {
-                    /*
-                    *   p1-----p2
-                    *   | \ f2 |
-                    *   |   \  |
-                    *   | f1  \|
-                    *   p3-----p4
-                    */
-
-                    p4 = rowOffset + imageX;
-                    p3 = p4 - 1;
-
-                    p2 = p4 - coordsAcross;
-                    p1 = p3 - coordsAcross;
-
-                    this.coords.Add(rows[imageY][imageX]);
-                    if (viewerMode)
-                    {
-                        this.normals.Add(new Coord());
-                        this.uvs.Add(new UVCoord(widthUnit * imageX, heightUnit * imageY));
-                    }
-
-                    if (imageY > 0 && imageX > 0)
-                    {
-                        Face f1, f2;
-
-                        if (viewerMode)
-                        {
-                            if (invert)
-                            {
-                                f1 = new Face(p1, p4, p3, p1, p4, p3);
-                                f1.uv1 = p1;
-                                f1.uv2 = p4;
-                                f1.uv3 = p3;
-
-                                f2 = new Face(p1, p2, p4, p1, p2, p4);
-                                f2.uv1 = p1;
-                                f2.uv2 = p2;
-                                f2.uv3 = p4;
-                            }
-                            else
-                            {
-                                f1 = new Face(p1, p3, p4, p1, p3, p4);
-                                f1.uv1 = p1;
-                                f1.uv2 = p3;
-                                f1.uv3 = p4;
-
-                                f2 = new Face(p1, p4, p2, p1, p4, p2);
-                                f2.uv1 = p1;
-                                f2.uv2 = p4;
-                                f2.uv3 = p2;
-                            }
-                        }
-                        else
-                        {
-                            if (invert)
-                            {
-                                f1 = new Face(p1, p4, p3);
-                                f2 = new Face(p1, p2, p4);
-                            }
-                            else
-                            {
-                                f1 = new Face(p1, p3, p4);
-                                f2 = new Face(p1, p4, p2);
-                            }
-                        }
-
-                        this.faces.Add(f1);
-                        this.faces.Add(f2);
-                    }
-                }
-            }
-
-            if (viewerMode)
-                calcVertexNormals(sculptType, coordsAcross, coordsDown);
-        }
-
-        /// <summary>
-        /// Duplicates a SculptMesh object. All object properties are copied by value, including lists.
-        /// </summary>
-        /// <returns></returns>
-        public SculptMesh Copy()
-        {
-            return new SculptMesh(this);
-        }
-
-        public SculptMesh(SculptMesh sm)
-        {
-            coords = new List<Coord>(sm.coords);
-            faces = new List<Face>(sm.faces);
-            viewerFaces = new List<ViewerFace>(sm.viewerFaces);
-            normals = new List<Coord>(sm.normals);
-            uvs = new List<UVCoord>(sm.uvs);
-        }
-
-        private void calcVertexNormals(SculptType sculptType, int xSize, int ySize)
-        {  // compute vertex normals by summing all the surface normals of all the triangles sharing
-            // each vertex and then normalizing
-            int numFaces = this.faces.Count;
-            for (int i = 0; i < numFaces; i++)
-            {
-                Face face = this.faces[i];
-                Coord surfaceNormal = face.SurfaceNormal(this.coords);
-                this.normals[face.n1] += surfaceNormal;
-                this.normals[face.n2] += surfaceNormal;
-                this.normals[face.n3] += surfaceNormal;
-            }
-
-            int numNormals = this.normals.Count;
-            for (int i = 0; i < numNormals; i++)
-                this.normals[i] = this.normals[i].Normalize();
-
-            if (sculptType != SculptType.plane)
-            { // blend the vertex normals at the cylinder seam
-                for (int y = 0; y < ySize; y++)
-                {
-                    int rowOffset = y * xSize;
-
-                    this.normals[rowOffset] = this.normals[rowOffset + xSize - 1] = (this.normals[rowOffset] + this.normals[rowOffset + xSize - 1]).Normalize();
-                }
-            }
-
-            foreach (Face face in this.faces)
-            {
-                ViewerFace vf = new ViewerFace(0);
-                vf.v1 = this.coords[face.v1];
-                vf.v2 = this.coords[face.v2];
-                vf.v3 = this.coords[face.v3];
-
-                vf.coordIndex1 = face.v1;
-                vf.coordIndex2 = face.v2;
-                vf.coordIndex3 = face.v3;
-
-                vf.n1 = this.normals[face.n1];
-                vf.n2 = this.normals[face.n2];
-                vf.n3 = this.normals[face.n3];
-
-                vf.uv1 = this.uvs[face.uv1];
-                vf.uv2 = this.uvs[face.uv2];
-                vf.uv3 = this.uvs[face.uv3];
-
-                this.viewerFaces.Add(vf);
-            }
-        }
-
-        /// <summary>
-        /// Adds a value to each XYZ vertex coordinate in the mesh
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <param name="z"></param>
-        public void AddPos(float x, float y, float z)
-        {
-            int i;
-            int numVerts = this.coords.Count;
-            Coord vert;
-
-            for (i = 0; i < numVerts; i++)
-            {
-                vert = this.coords[i];
-                vert.X += x;
-                vert.Y += y;
-                vert.Z += z;
-                this.coords[i] = vert;
-            }
-
-            if (this.viewerFaces != null)
-            {
-                int numViewerFaces = this.viewerFaces.Count;
-
-                for (i = 0; i < numViewerFaces; i++)
-                {
-                    ViewerFace v = this.viewerFaces[i];
-                    v.AddPos(x, y, z);
-                    this.viewerFaces[i] = v;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Rotates the mesh
-        /// </summary>
-        /// <param name="q"></param>
-        public void AddRot(Quat q)
-        {
-            int i;
-            int numVerts = this.coords.Count;
-
-            for (i = 0; i < numVerts; i++)
-                this.coords[i] *= q;
-
-            int numNormals = this.normals.Count;
-            for (i = 0; i < numNormals; i++)
-                this.normals[i] *= q;
-
-            if (this.viewerFaces != null)
-            {
-                int numViewerFaces = this.viewerFaces.Count;
-
-                for (i = 0; i < numViewerFaces; i++)
-                {
-                    ViewerFace v = this.viewerFaces[i];
-                    v.v1 *= q;
-                    v.v2 *= q;
-                    v.v3 *= q;
-
-                    v.n1 *= q;
-                    v.n2 *= q;
-                    v.n3 *= q;
-
-                    this.viewerFaces[i] = v;
-                }
-            }
-        }
-
-        public void Scale(float x, float y, float z)
-        {
-            int i;
-            int numVerts = this.coords.Count;
-
-            Coord m = new Coord(x, y, z);
-            for (i = 0; i < numVerts; i++)
-                this.coords[i] *= m;
-
-            if (this.viewerFaces != null)
-            {
-                int numViewerFaces = this.viewerFaces.Count;
-                for (i = 0; i < numViewerFaces; i++)
-                {
-                    ViewerFace v = this.viewerFaces[i];
-                    v.v1 *= m;
-                    v.v2 *= m;
-                    v.v3 *= m;
-                    this.viewerFaces[i] = v;
-                }
-            }
-        }
-
-        public void DumpRaw(String path, String name, String title)
-        {
-            if (path == null)
-                return;
-            String fileName = name + "_" + title + ".raw";
-            String completePath = System.IO.Path.Combine(path, fileName);
-            StreamWriter sw = new StreamWriter(completePath);
-
-            for (int i = 0; i < this.faces.Count; i++)
-            {
-                string s = this.coords[this.faces[i].v1].ToString();
-                s += " " + this.coords[this.faces[i].v2].ToString();
-                s += " " + this.coords[this.faces[i].v3].ToString();
-
-                sw.WriteLine(s);
-            }
-
-            sw.Close();
-        }
-    }
-}
+/*

+ * Copyright (c) Contributors

+ * See CONTRIBUTORS.TXT for a full list of copyright holders.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *     * Redistributions of source code must retain the above copyright

+ *       notice, this list of conditions and the following disclaimer.

+ *     * Redistributions in binary form must reproduce the above copyright

+ *       notice, this list of conditions and the following disclaimer in the

+ *       documentation and/or other materials provided with the distribution.

+ *     * Neither the name of the OpenSimulator Project nor the

+ *       names of its contributors may be used to endorse or promote products

+ *       derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ */

+

+// to build without references to System.Drawing, comment this out

+#define SYSTEM_DRAWING

+

+using System;

+using System.Collections.Generic;

+using System.Text;

+using System.IO;

+

+#if SYSTEM_DRAWING

+using System.Drawing;

+using System.Drawing.Imaging;

+#endif

+

+namespace PrimMesher

+{

+

+    public class SculptMesh

+    {

+        public List<Coord> coords;

+        public List<Face> faces;

+

+        public List<ViewerFace> viewerFaces;

+        public List<Coord> normals;

+        public List<UVCoord> uvs;

+

+        public enum SculptType { sphere = 1, torus = 2, plane = 3, cylinder = 4 };

+

+#if SYSTEM_DRAWING

+        private Bitmap ScaleImage(Bitmap srcImage, float scale, bool removeAlpha)

+        {

+            int sourceWidth = srcImage.Width;

+            int sourceHeight = srcImage.Height;

+            int sourceX = 0;

+            int sourceY = 0;

+

+            int destX = 0;

+            int destY = 0;

+            int destWidth = (int)(srcImage.Width * scale);

+            int destHeight = (int)(srcImage.Height * scale);

+

+            Bitmap scaledImage;

+

+            if (removeAlpha)

+            {

+                if (srcImage.PixelFormat == PixelFormat.Format32bppArgb)

+                    for (int y = 0; y < srcImage.Height; y++)

+                        for (int x = 0; x < srcImage.Width; x++)

+                        {

+                            Color c = srcImage.GetPixel(x, y);

+                            srcImage.SetPixel(x, y, Color.FromArgb(255, c.R, c.G, c.B));

+                        }

+

+                scaledImage = new Bitmap(destWidth, destHeight,

+                                         PixelFormat.Format24bppRgb);

+            }

+            else

+                scaledImage = new Bitmap(srcImage, destWidth, destHeight);

+

+            scaledImage.SetResolution(96.0f, 96.0f);

+

+            Graphics grPhoto = Graphics.FromImage(scaledImage);

+            grPhoto.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.Low;

+

+            grPhoto.DrawImage(srcImage,

+                new Rectangle(destX, destY, destWidth, destHeight),

+                new Rectangle(sourceX, sourceY, sourceWidth, sourceHeight),

+                GraphicsUnit.Pixel);

+

+            grPhoto.Dispose();

+            return scaledImage;

+        }

+

+

+        public SculptMesh SculptMeshFromFile(string fileName, SculptType sculptType, int lod, bool viewerMode)

+        {

+            Bitmap bitmap = (Bitmap)Bitmap.FromFile(fileName);

+            SculptMesh sculptMesh = new SculptMesh(bitmap, sculptType, lod, viewerMode);

+            bitmap.Dispose();

+            return sculptMesh;

+        }

+

+        public SculptMesh(string fileName, int sculptType, int lod, int viewerMode, int mirror, int invert)

+        {

+            Bitmap bitmap = (Bitmap)Bitmap.FromFile(fileName);

+            _SculptMesh(bitmap, (SculptType)sculptType, lod, viewerMode != 0, mirror != 0, invert != 0);

+            bitmap.Dispose();

+        }

+#endif

+

+        /// <summary>

+        /// ** Experimental ** May disappear from future versions ** not recommeneded for use in applications

+        /// Construct a sculpt mesh from a 2D array of floats

+        /// </summary>

+        /// <param name="zMap"></param>

+        /// <param name="xBegin"></param>

+        /// <param name="xEnd"></param>

+        /// <param name="yBegin"></param>

+        /// <param name="yEnd"></param>

+        /// <param name="viewerMode"></param>

+        public SculptMesh(float[,] zMap, float xBegin, float xEnd, float yBegin, float yEnd, bool viewerMode)

+        {

+            float xStep, yStep;

+            float uStep, vStep;

+

+            int numYElements = zMap.GetLength(0);

+            int numXElements = zMap.GetLength(1);

+

+            try

+            {

+                xStep = (xEnd - xBegin) / (float)(numXElements - 1);

+                yStep = (yEnd - yBegin) / (float)(numYElements - 1);

+

+                uStep = 1.0f / (numXElements - 1);

+                vStep = 1.0f / (numYElements - 1);

+            }

+            catch (DivideByZeroException)

+            {

+                return;

+            }

+

+            coords = new List<Coord>();

+            faces = new List<Face>();

+            normals = new List<Coord>();

+            uvs = new List<UVCoord>();

+

+            viewerFaces = new List<ViewerFace>();

+

+            int p1, p2, p3, p4;

+

+            int x, y;

+            int xStart = 0, yStart = 0;

+

+            for (y = yStart; y < numYElements; y++)

+            {

+                int rowOffset = y * numXElements;

+

+                for (x = xStart; x < numXElements; x++)

+                {

+                    /*

+                    *   p1-----p2

+                    *   | \ f2 |

+                    *   |   \  |

+                    *   | f1  \|

+                    *   p3-----p4

+                    */

+

+                    p4 = rowOffset + x;

+                    p3 = p4 - 1;

+

+                    p2 = p4 - numXElements;

+                    p1 = p3 - numXElements;

+

+                    Coord c = new Coord(xBegin + x * xStep, yBegin + y * yStep, zMap[y, x]);

+                    this.coords.Add(c);

+                    if (viewerMode)

+                    {

+                        this.normals.Add(new Coord());

+                        this.uvs.Add(new UVCoord(uStep * x, 1.0f - vStep * y));

+                    }

+

+                    if (y > 0 && x > 0)

+                    {

+                        Face f1, f2;

+

+                        if (viewerMode)

+                        {

+                            f1 = new Face(p1, p4, p3, p1, p4, p3);

+                            f1.uv1 = p1;

+                            f1.uv2 = p4;

+                            f1.uv3 = p3;

+

+                            f2 = new Face(p1, p2, p4, p1, p2, p4);

+                            f2.uv1 = p1;

+                            f2.uv2 = p2;

+                            f2.uv3 = p4;

+                        }

+                        else

+                        {

+                            f1 = new Face(p1, p4, p3);

+                            f2 = new Face(p1, p2, p4);

+                        }

+

+                        this.faces.Add(f1);

+                        this.faces.Add(f2);

+                    }

+                }

+            }

+

+            if (viewerMode)

+                calcVertexNormals(SculptType.plane, numXElements, numYElements);

+        }

+

+#if SYSTEM_DRAWING

+        public SculptMesh(Bitmap sculptBitmap, SculptType sculptType, int lod, bool viewerMode)

+        {

+            _SculptMesh(sculptBitmap, sculptType, lod, viewerMode, false, false);

+        }

+

+        public SculptMesh(Bitmap sculptBitmap, SculptType sculptType, int lod, bool viewerMode, bool mirror, bool invert)

+        {

+            _SculptMesh(sculptBitmap, sculptType, lod, viewerMode, mirror, invert);

+        }

+#endif

+

+        public SculptMesh(List<List<Coord>> rows, SculptType sculptType, bool viewerMode, bool mirror, bool invert)

+        {

+            _SculptMesh(rows, sculptType, viewerMode, mirror, invert);

+        }

+

+#if SYSTEM_DRAWING

+        /// <summary>

+        /// converts a bitmap to a list of lists of coords, while scaling the image.

+        /// the scaling is done in floating point so as to allow for reduced vertex position

+        /// quantization as the position will be averaged between pixel values. this routine will

+        /// likely fail if the bitmap width and height are not powers of 2.

+        /// </summary>

+        /// <param name="bitmap"></param>

+        /// <param name="scale"></param>

+        /// <param name="mirror"></param>

+        /// <returns></returns>

+        private List<List<Coord>> bitmap2Coords(Bitmap bitmap, int scale, bool mirror)

+        {

+            int numRows = bitmap.Height / scale;

+            int numCols = bitmap.Width / scale;

+            List<List<Coord>> rows = new List<List<Coord>>(numRows);

+

+            float pixScale = 1.0f / (scale * scale);

+            pixScale /= 255;

+

+            int imageX, imageY = 0;

+

+            int rowNdx, colNdx;

+

+            for (rowNdx = 0; rowNdx < numRows; rowNdx++)

+            {

+                List<Coord> row = new List<Coord>(numCols);

+                for (colNdx = 0; colNdx < numCols; colNdx++)

+                {

+                    imageX = colNdx * scale;

+                    int imageYStart = rowNdx * scale;

+                    int imageYEnd = imageYStart + scale;

+                    int imageXEnd = imageX + scale;

+                    float rSum = 0.0f;

+                    float gSum = 0.0f;

+                    float bSum = 0.0f;

+                    for (; imageX < imageXEnd; imageX++)

+                    {

+                        for (imageY = imageYStart; imageY < imageYEnd; imageY++)

+                        {

+                            Color c = bitmap.GetPixel(imageX, imageY);

+                            if (c.A != 255)

+                            {

+                                bitmap.SetPixel(imageX, imageY, Color.FromArgb(255, c.R, c.G, c.B));

+                                c = bitmap.GetPixel(imageX, imageY);

+                            }

+                            rSum += c.R;

+                            gSum += c.G;

+                            bSum += c.B;

+                        }

+                    }

+                    if (mirror)

+                        row.Add(new Coord(-(rSum * pixScale - 0.5f), gSum * pixScale - 0.5f, bSum * pixScale - 0.5f));

+                    else

+                        row.Add(new Coord(rSum * pixScale - 0.5f, gSum * pixScale - 0.5f, bSum * pixScale - 0.5f));

+

+                }

+                rows.Add(row);

+            }

+            return rows;

+        }

+

+

+        void _SculptMesh(Bitmap sculptBitmap, SculptType sculptType, int lod, bool viewerMode, bool mirror, bool invert)

+        {

+            coords = new List<Coord>();

+            faces = new List<Face>();

+            normals = new List<Coord>();

+            uvs = new List<UVCoord>();

+

+            sculptType = (SculptType)(((int)sculptType) & 0x07);

+

+            if (mirror)

+                if (sculptType == SculptType.plane)

+                    invert = !invert;

+

+            float sculptBitmapLod = (float)Math.Sqrt(sculptBitmap.Width * sculptBitmap.Height);

+

+            float sourceScaleFactor = (float)(lod) / sculptBitmapLod;

+

+            float fScale = 1.0f / sourceScaleFactor;

+

+            int iScale = (int)fScale;

+            if (iScale < 1) iScale = 1;

+            if (iScale > 2 && iScale % 2 == 0)

+                _SculptMesh(bitmap2Coords(ScaleImage(sculptBitmap, 64.0f / sculptBitmapLod, true), 64 / lod, mirror), sculptType, viewerMode, mirror, invert);

+            else

+                _SculptMesh(bitmap2Coords(sculptBitmap, iScale, mirror), sculptType, viewerMode, mirror, invert);

+        }

+#endif

+

+

+        void _SculptMesh(List<List<Coord>> rows, SculptType sculptType, bool viewerMode, bool mirror, bool invert)

+        {

+            coords = new List<Coord>();

+            faces = new List<Face>();

+            normals = new List<Coord>();

+            uvs = new List<UVCoord>();

+

+            sculptType = (SculptType)(((int)sculptType) & 0x07);

+

+            if (mirror)

+                if (sculptType == SculptType.plane)

+                    invert = !invert;

+

+            viewerFaces = new List<ViewerFace>();

+

+            int width = rows[0].Count;

+

+            int p1, p2, p3, p4;

+

+            int imageX, imageY;

+

+            if (sculptType != SculptType.plane)

+            {

+                for (int rowNdx = 0; rowNdx < rows.Count; rowNdx++)

+                    rows[rowNdx].Add(rows[rowNdx][0]);

+            }

+

+            Coord topPole = rows[0][width / 2];

+            Coord bottomPole = rows[rows.Count - 1][width / 2];

+

+            if (sculptType == SculptType.sphere)

+            {

+                int count = rows[0].Count;

+                List<Coord> topPoleRow = new List<Coord>(count);

+                List<Coord> bottomPoleRow = new List<Coord>(count);

+

+                for (int i = 0; i < count; i++)

+                {

+                    topPoleRow.Add(topPole);

+                    bottomPoleRow.Add(bottomPole);

+                }

+                rows.Insert(0, topPoleRow);

+                rows.Add(bottomPoleRow);

+            }

+            else if (sculptType == SculptType.torus)

+                rows.Add(rows[0]);

+

+            int coordsDown = rows.Count;

+            int coordsAcross = rows[0].Count;

+

+            float widthUnit = 1.0f / (coordsAcross - 1);

+            float heightUnit = 1.0f / (coordsDown - 1);

+

+            for (imageY = 0; imageY < coordsDown; imageY++)

+            {

+                int rowOffset = imageY * coordsAcross;

+

+                for (imageX = 0; imageX < coordsAcross; imageX++)

+                {

+                    /*

+                    *   p1-----p2

+                    *   | \ f2 |

+                    *   |   \  |

+                    *   | f1  \|

+                    *   p3-----p4

+                    */

+

+                    p4 = rowOffset + imageX;

+                    p3 = p4 - 1;

+

+                    p2 = p4 - coordsAcross;

+                    p1 = p3 - coordsAcross;

+

+                    this.coords.Add(rows[imageY][imageX]);

+                    if (viewerMode)

+                    {

+                        this.normals.Add(new Coord());

+                        this.uvs.Add(new UVCoord(widthUnit * imageX, heightUnit * imageY));

+                    }

+

+                    if (imageY > 0 && imageX > 0)

+                    {

+                        Face f1, f2;

+

+                        if (viewerMode)

+                        {

+                            if (invert)

+                            {

+                                f1 = new Face(p1, p4, p3, p1, p4, p3);

+                                f1.uv1 = p1;

+                                f1.uv2 = p4;

+                                f1.uv3 = p3;

+

+                                f2 = new Face(p1, p2, p4, p1, p2, p4);

+                                f2.uv1 = p1;

+                                f2.uv2 = p2;

+                                f2.uv3 = p4;

+                            }

+                            else

+                            {

+                                f1 = new Face(p1, p3, p4, p1, p3, p4);

+                                f1.uv1 = p1;

+                                f1.uv2 = p3;

+                                f1.uv3 = p4;

+

+                                f2 = new Face(p1, p4, p2, p1, p4, p2);

+                                f2.uv1 = p1;

+                                f2.uv2 = p4;

+                                f2.uv3 = p2;

+                            }

+                        }

+                        else

+                        {

+                            if (invert)

+                            {

+                                f1 = new Face(p1, p4, p3);

+                                f2 = new Face(p1, p2, p4);

+                            }

+                            else

+                            {

+                                f1 = new Face(p1, p3, p4);

+                                f2 = new Face(p1, p4, p2);

+                            }

+                        }

+

+                        this.faces.Add(f1);

+                        this.faces.Add(f2);

+                    }

+                }

+            }

+

+            if (viewerMode)

+                calcVertexNormals(sculptType, coordsAcross, coordsDown);

+        }

+

+        /// <summary>

+        /// Duplicates a SculptMesh object. All object properties are copied by value, including lists.

+        /// </summary>

+        /// <returns></returns>

+        public SculptMesh Copy()

+        {

+            return new SculptMesh(this);

+        }

+

+        public SculptMesh(SculptMesh sm)

+        {

+            coords = new List<Coord>(sm.coords);

+            faces = new List<Face>(sm.faces);

+            viewerFaces = new List<ViewerFace>(sm.viewerFaces);

+            normals = new List<Coord>(sm.normals);

+            uvs = new List<UVCoord>(sm.uvs);

+        }

+

+        private void calcVertexNormals(SculptType sculptType, int xSize, int ySize)

+        {  // compute vertex normals by summing all the surface normals of all the triangles sharing

+            // each vertex and then normalizing

+            int numFaces = this.faces.Count;

+            for (int i = 0; i < numFaces; i++)

+            {

+                Face face = this.faces[i];

+                Coord surfaceNormal = face.SurfaceNormal(this.coords);

+                this.normals[face.n1] += surfaceNormal;

+                this.normals[face.n2] += surfaceNormal;

+                this.normals[face.n3] += surfaceNormal;

+            }

+

+            int numNormals = this.normals.Count;

+            for (int i = 0; i < numNormals; i++)

+                this.normals[i] = this.normals[i].Normalize();

+

+            if (sculptType != SculptType.plane)

+            { // blend the vertex normals at the cylinder seam

+                for (int y = 0; y < ySize; y++)

+                {

+                    int rowOffset = y * xSize;

+

+                    this.normals[rowOffset] = this.normals[rowOffset + xSize - 1] = (this.normals[rowOffset] + this.normals[rowOffset + xSize - 1]).Normalize();

+                }

+            }

+

+            foreach (Face face in this.faces)

+            {

+                ViewerFace vf = new ViewerFace(0);

+                vf.v1 = this.coords[face.v1];

+                vf.v2 = this.coords[face.v2];

+                vf.v3 = this.coords[face.v3];

+

+                vf.coordIndex1 = face.v1;

+                vf.coordIndex2 = face.v2;

+                vf.coordIndex3 = face.v3;

+

+                vf.n1 = this.normals[face.n1];

+                vf.n2 = this.normals[face.n2];

+                vf.n3 = this.normals[face.n3];

+

+                vf.uv1 = this.uvs[face.uv1];

+                vf.uv2 = this.uvs[face.uv2];

+                vf.uv3 = this.uvs[face.uv3];

+

+                this.viewerFaces.Add(vf);

+            }

+        }

+

+        /// <summary>

+        /// Adds a value to each XYZ vertex coordinate in the mesh

+        /// </summary>

+        /// <param name="x"></param>

+        /// <param name="y"></param>

+        /// <param name="z"></param>

+        public void AddPos(float x, float y, float z)

+        {

+            int i;

+            int numVerts = this.coords.Count;

+            Coord vert;

+

+            for (i = 0; i < numVerts; i++)

+            {

+                vert = this.coords[i];

+                vert.X += x;

+                vert.Y += y;

+                vert.Z += z;

+                this.coords[i] = vert;

+            }

+

+            if (this.viewerFaces != null)

+            {

+                int numViewerFaces = this.viewerFaces.Count;

+

+                for (i = 0; i < numViewerFaces; i++)

+                {

+                    ViewerFace v = this.viewerFaces[i];

+                    v.AddPos(x, y, z);

+                    this.viewerFaces[i] = v;

+                }

+            }

+        }

+

+        /// <summary>

+        /// Rotates the mesh

+        /// </summary>

+        /// <param name="q"></param>

+        public void AddRot(Quat q)

+        {

+            int i;

+            int numVerts = this.coords.Count;

+

+            for (i = 0; i < numVerts; i++)

+                this.coords[i] *= q;

+

+            int numNormals = this.normals.Count;

+            for (i = 0; i < numNormals; i++)

+                this.normals[i] *= q;

+

+            if (this.viewerFaces != null)

+            {

+                int numViewerFaces = this.viewerFaces.Count;

+

+                for (i = 0; i < numViewerFaces; i++)

+                {

+                    ViewerFace v = this.viewerFaces[i];

+                    v.v1 *= q;

+                    v.v2 *= q;

+                    v.v3 *= q;

+

+                    v.n1 *= q;

+                    v.n2 *= q;

+                    v.n3 *= q;

+

+                    this.viewerFaces[i] = v;

+                }

+            }

+        }

+

+        public void Scale(float x, float y, float z)

+        {

+            int i;

+            int numVerts = this.coords.Count;

+

+            Coord m = new Coord(x, y, z);

+            for (i = 0; i < numVerts; i++)

+                this.coords[i] *= m;

+

+            if (this.viewerFaces != null)

+            {

+                int numViewerFaces = this.viewerFaces.Count;

+                for (i = 0; i < numViewerFaces; i++)

+                {

+                    ViewerFace v = this.viewerFaces[i];

+                    v.v1 *= m;

+                    v.v2 *= m;

+                    v.v3 *= m;

+                    this.viewerFaces[i] = v;

+                }

+            }

+        }

+

+        public void DumpRaw(String path, String name, String title)

+        {

+            if (path == null)

+                return;

+            String fileName = name + "_" + title + ".raw";

+            String completePath = System.IO.Path.Combine(path, fileName);

+            StreamWriter sw = new StreamWriter(completePath);

+

+            for (int i = 0; i < this.faces.Count; i++)

+            {

+                string s = this.coords[this.faces[i].v1].ToString();

+                s += " " + this.coords[this.faces[i].v2].ToString();

+                s += " " + this.coords[this.faces[i].v3].ToString();

+

+                sw.WriteLine(s);

+            }

+

+            sw.Close();

+        }

+    }

+}

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 2ab00a3..be7c348 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1575,11 +1575,11 @@ Console.WriteLine(" JointCreateFixed");
                 {
 //Console.WriteLine("Move " +  m_primName);
                     if (!d.BodyIsEnabled (Body))  d.BodyEnable (Body); // KF add 161009
-                    /*
                     // NON-'VEHICLES' are dealt with here
                     if (d.BodyIsEnabled(Body) && !m_angularlock.ApproxEquals(Vector3.Zero, 0.003f))
                     {
                         d.Vector3 avel2 = d.BodyGetAngularVel(Body);
+                        /*
                         if (m_angularlock.X == 1)
                             avel2.X = 0;
                         if (m_angularlock.Y == 1)
@@ -1587,8 +1587,8 @@ Console.WriteLine(" JointCreateFixed");
                         if (m_angularlock.Z == 1)
                             avel2.Z = 0;
                         d.BodySetAngularVel(Body, avel2.X, avel2.Y, avel2.Z);
+                         */
                     }
-                    */
                     //float PID_P = 900.0f;
 
                     float m_mass = CalculateMass();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 62eae76..8f82304 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4221,7 +4221,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return;
             }
 
-            if( message == string.Empty)
+            if (message == string.Empty)
             {
                 ShoutError("Trying to use llTextBox with empty message.");
             }
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 9c54410..a399672 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -57,6 +57,12 @@ namespace OpenSim.Server.Base
             return ret;
         }
 
+        /// <summary>
+        /// Load a plugin from a dll with the given class or interface
+        /// </summary>
+        /// <param name="dllName"></param>
+        /// <param name="args">The arguments which control which constructor is invoked on the plugin</param>
+        /// <returns></returns>        
         public static T LoadPlugin<T>(string dllName, Object[] args) where T:class
         {
             string[] parts = dllName.Split(new char[] {':'});
@@ -71,6 +77,13 @@ namespace OpenSim.Server.Base
             return LoadPlugin<T>(dllName, className, args);
         }
 
+        /// <summary>
+        /// Load a plugin from a dll with the given class or interface
+        /// </summary>
+        /// <param name="dllName"></param>
+        /// <param name="className"></param>
+        /// <param name="args">The arguments which control which constructor is invoked on the plugin</param>
+        /// <returns></returns>
         public static T LoadPlugin<T>(string dllName, string className, Object[] args) where T:class
         {
             string interfaceName = typeof(T).ToString();
@@ -83,28 +96,15 @@ namespace OpenSim.Server.Base
                 {
                     if (pluginType.IsPublic)
                     {
-                        if (className != String.Empty &&
-                                pluginType.ToString() !=
-                                pluginType.Namespace + "." + className)
+                        if (className != String.Empty 
+                            && pluginType.ToString() != pluginType.Namespace + "." + className)
                             continue;
-                        Type typeInterface =
-                                pluginType.GetInterface(interfaceName, true);
+                        
+                        Type typeInterface = pluginType.GetInterface(interfaceName, true);
+                        
                         if (typeInterface != null)
                         {
-                            T plug = null;
-                            try
-                            {
-                                plug = (T)Activator.CreateInstance(pluginType,
-                                        args);
-                            }
-                            catch (Exception e)
-                            {
-                                if (!(e is System.MissingMethodException))
-                                    m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException);
-                                return null;
-                            }
-
-                            return plug;
+                            return (T)Activator.CreateInstance(pluginType, args);
                         }
                     }
                 }
@@ -113,7 +113,7 @@ namespace OpenSim.Server.Base
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e);
+                m_log.Error(string.Format("Error loading plugin from {0}", dllName), e);
                 return null;
             }
         }
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
index 79c6b2a..6b1152b 100644
--- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.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;
 using System.Collections.Generic;
 using System.Net;
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index f9db859..34f7dcc 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -289,7 +289,7 @@ namespace OpenSim.Server.Handlers.Asset
                 foreach (InventoryItemBase i in icoll.Items)
                     items[i.ID.ToString()] = EncodeItem(i);
                 result["ITEMS"] = items;
-            }            
+            }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
             m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs
index 91d5c56..ef30cba 100644
--- a/OpenSim/Services/Base/ServiceBase.cs
+++ b/OpenSim/Services/Base/ServiceBase.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Services.Base
 //                    m_log.DebugFormat("[SERVICE BASE]: Found type {0}", pluginType);
 
                     if (pluginType.IsPublic)
-                    {                        
+                    {
                         if (className != String.Empty &&
                                 pluginType.ToString() !=
                                 pluginType.Namespace + "." + className)
diff --git a/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
index ce88236..0e85067 100644
--- a/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
+++ b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
@@ -28,9 +28,9 @@
 using System;
 
 namespace OpenSim.Services.Connectors
-{     
+{
     public class GridUserServiceConnector
-    {       
+    {
         public GridUserServiceConnector()
         {
         }
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index 9f73b38..c426bba 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.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;
 using System.Collections.Generic;
 using System.Drawing;
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 83d3449..3e91e3a 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.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;
 using System.Collections.Generic;
 using System.IO;
@@ -334,7 +361,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             }
             catch (Exception e)
             {
-                m_log.Debug("[HGrid]: Exception " + e.Message);
+                m_log.Debug("[USER AGENT CONNECTOR]: Unable to contact remote server ");
                 reason = "Exception: " + e.Message;
                 return false;
             }
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
index 9821dd4..0cc1978 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Services.Connectors
                     });
 
             if (ret == null)
-                return null;            
+                return null;
             if (ret.Count == 0)
                 return null;
 
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
new file mode 100644
index 0000000..1c22a72
--- /dev/null
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -0,0 +1,410 @@
+/*
+ * 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 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;
+
+namespace OpenSim.Services.Connectors.SimianGrid
+{
+    /// <summary>
+    /// Connects to the SimianGrid asset service
+    /// </summary>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class SimianAssetServiceConnector : IAssetService, ISharedRegionModule
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+        private static string ZeroID = UUID.Zero.ToString();
+
+        private string m_serverUrl = String.Empty;
+        private IImprovedAssetCache m_cache;
+
+        #region ISharedRegionModule
+
+        public Type ReplaceableInterface { get { return null; } }
+        public void RegionLoaded(Scene scene)
+        {
+            if (m_cache == null)
+            {
+                IImprovedAssetCache cache = scene.RequestModuleInterface<IImprovedAssetCache>();
+                if (cache is ISharedRegionModule)
+                    m_cache = cache;
+            }
+        }
+        public void PostInitialise() { }
+        public void Close() { }
+
+        public SimianAssetServiceConnector() { }
+        public string Name { get { return "SimianAssetServiceConnector"; } }
+        public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.RegisterModuleInterface<IAssetService>(this); } }
+        public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.UnregisterModuleInterface<IAssetService>(this); } }
+        
+        #endregion ISharedRegionModule
+
+        public SimianAssetServiceConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            if (Simian.IsSimianEnabled(source, "AssetServices"))
+            {
+                IConfig gridConfig = source.Configs["AssetService"];
+                if (gridConfig == null)
+                {
+                    m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpenSim.ini");
+                    throw new Exception("Asset connector init error");
+                }
+
+                string serviceUrl = gridConfig.GetString("AssetServerURI");
+                if (String.IsNullOrEmpty(serviceUrl))
+                {
+                    m_log.Error("[ASSET CONNECTOR]: No AssetServerURI in section AssetService");
+                    throw new Exception("Asset connector init error");
+                }
+
+                if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
+                    serviceUrl = serviceUrl + '/';
+
+                m_serverUrl = serviceUrl;
+            }
+        }
+
+        #region IAssetService
+
+        public AssetBase Get(string id)
+        {
+            AssetBase asset = null;
+
+            // Cache fetch
+            if (m_cache != null)
+            {
+                asset = m_cache.Get(id);
+                if (asset != null)
+                    return asset;
+            }
+
+            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.CopyTo(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("[ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message);
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Get an asset's metadata
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public AssetMetadata GetMetadata(string id)
+        {
+            AssetMetadata metadata = null;
+
+            // Cache fetch
+            if (m_cache != null)
+            {
+                AssetBase asset = m_cache.Get(id);
+                if (asset != null)
+                    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("[ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message);
+            }
+
+            return metadata;
+        }
+
+        public byte[] GetData(string id)
+        {
+            AssetBase asset = Get(id);
+
+            if (asset != null)
+                return asset.Data;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Get an asset asynchronously
+        /// </summary>
+        /// <param name="id">The asset id</param>
+        /// <param name="sender">Represents the requester.  Passed back via the handler</param>
+        /// <param name="handler">The handler to call back once the asset has been retrieved</param>
+        /// <returns>True if the id was parseable, false otherwise</returns>
+        public bool Get(string id, Object sender, AssetRetrieved handler)
+        {
+            Util.FireAndForget(
+                delegate(object o)
+                {
+                    AssetBase asset = Get(id);
+                    handler(id, sender, asset);
+                }
+            );
+
+            return true;
+        }
+
+        /// <summary>
+        /// Creates a new asset
+        /// </summary>
+        /// Returns a random ID if none is passed into it
+        /// <param name="asset"></param>
+        /// <returns></returns>
+        public string Store(AssetBase asset)
+        {
+            bool storedInCache = false;
+            string errorMessage = null;
+
+            // AssetID handling
+            if (String.IsNullOrEmpty(asset.ID) || asset.ID == ZeroID)
+            {
+                asset.FullID = UUID.Random();
+                asset.ID = asset.FullID.ToString();
+            }
+
+            // Cache handling
+            if (m_cache != null)
+            {
+                m_cache.Cache(asset);
+                storedInCache = true;
+            }
+
+            // Local asset handling
+            if (asset.Local)
+            {
+                if (!storedInCache)
+                {
+                    m_log.Error("Cannot store local " + asset.Metadata.ContentType + " asset without an asset cache");
+                    asset.ID = null;
+                    asset.FullID = UUID.Zero;
+                }
+
+                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
+            {
+                HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl);
+                
+                HttpWebResponse response = MultipartForm.Post(request, postParameters);
+                using (Stream responseStream = response.GetResponseStream())
+                {
+                    try
+                    {
+                        string 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.";
+                        }
+                    }
+                    catch
+                    {
+                        errorMessage = "Failed to parse the response.";
+                    }
+                }
+            }
+            catch (WebException ex)
+            {
+                errorMessage = ex.Message;
+            }
+
+            m_log.WarnFormat("[ASSET CONNECTOR]: Failed to store asset \"{0}\" ({1}, {2}): {3}",
+                asset.Name, asset.ID, asset.Metadata.ContentType, errorMessage);
+            return null;
+        }
+
+        /// <summary>
+        /// Update an asset's content
+        /// </summary>
+        /// Attachments and bare scripts need this!!
+        /// <param name="id"> </param>
+        /// <param name="data"></param>
+        /// <returns></returns>
+        public bool UpdateContent(string id, byte[] data)
+        {
+            AssetBase asset = Get(id);
+
+            if (asset == null)
+            {
+                m_log.Warn("[ASSET CONNECTOR]: Failed to fetch asset " + id + " for updating");
+                return false;
+            }
+
+            asset.Data = data;
+
+            string result = Store(asset);
+            return !String.IsNullOrEmpty(result);
+        }
+
+        /// <summary>
+        /// Delete an asset
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public bool Delete(string id)
+        {
+            if (m_cache != null)
+                m_cache.Expire(id);
+
+            string url = m_serverUrl + id;
+
+            OSDMap response = WebUtil.ServiceRequest(url, "DELETE");
+            if (response["Success"].AsBoolean())
+                return true;
+            else
+                m_log.Warn("[ASSET CONNECTOR]: Failed to delete asset " + id + " from the asset service");
+
+            return false;
+        }
+
+        #endregion IAssetService
+    }
+}
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
new file mode 100644
index 0000000..6317b87
--- /dev/null
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.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.Specialized;
+using System.Reflection;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+
+namespace OpenSim.Services.Connectors.SimianGrid
+{
+    /// <summary>
+    /// Connects authentication/authorization to the SimianGrid backend
+    /// </summary>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class SimianAuthenticationServiceConnector : IAuthenticationService, ISharedRegionModule
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_serverUrl = String.Empty;
+
+        #region ISharedRegionModule
+
+        public Type ReplaceableInterface { get { return null; } }
+        public void RegionLoaded(Scene scene) { }
+        public void PostInitialise() { }
+        public void Close() { }
+
+        public SimianAuthenticationServiceConnector() { }
+        public string Name { get { return "SimianAuthenticationServiceConnector"; } }
+        public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.RegisterModuleInterface<IAuthenticationService>(this); } }
+        public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.UnregisterModuleInterface<IAuthenticationService>(this); } }
+
+        #endregion ISharedRegionModule
+
+        public SimianAuthenticationServiceConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            if (Simian.IsSimianEnabled(source, "AuthenticationServices"))
+            {
+                IConfig assetConfig = source.Configs["AuthenticationService"];
+                if (assetConfig == null)
+                {
+                    m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini");
+                    throw new Exception("Authentication connector init error");
+                }
+
+                string serviceURI = assetConfig.GetString("AuthenticationServerURI");
+                if (String.IsNullOrEmpty(serviceURI))
+                {
+                    m_log.Error("[AUTH CONNECTOR]: No Server URI named in section AuthenticationService");
+                    throw new Exception("Authentication connector init error");
+                }
+
+                m_serverUrl = serviceURI;
+            }
+        }
+
+        public string Authenticate(UUID principalID, string password, int lifetime)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetIdentities" },
+                { "UserID", principalID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean() && response["Identities"] is OSDArray)
+            {
+                OSDArray identities = (OSDArray)response["Identities"];
+                for (int i = 0; i < identities.Count; i++)
+                {
+                    OSDMap identity = identities[i] as OSDMap;
+                    if (identity != null)
+                    {
+                        if (identity["Type"].AsString() == "md5hash")
+                        {
+                            string credential = identity["Credential"].AsString();
+
+                            if (password == credential || Utils.MD5String(password) == credential)
+                                return Authorize(principalID);
+                        }
+                    }
+                }
+
+                m_log.Warn("[AUTH CONNECTOR]: Authentication failed for " + principalID);
+            }
+            else
+            {
+                m_log.Warn("[AUTH CONNECTOR]: Failed to retrieve identities for " + principalID + ": "  +
+                    response["Message"].AsString());
+            }
+
+            return String.Empty;
+        }
+
+        public bool Verify(UUID principalID, string token, int lifetime)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetSession" },
+                { "SessionID", token }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+            {
+                return true;
+            }
+            else
+            {
+                m_log.Warn("[AUTH CONNECTOR]: Could not verify session for " + principalID + ": " +
+                    response["Message"].AsString());
+            }
+
+            return false;
+        }
+
+        public bool Release(UUID principalID, string token)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "RemoveSession" },
+                { "UserID", principalID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+            {
+                return true;
+            }
+            else
+            {
+                m_log.Warn("[AUTH CONNECTOR]: Failed to remove session for " + principalID + ": " +
+                    response["Message"].AsString());
+            }
+
+            return false;
+        }
+
+        public bool SetPassword(UUID principalID, string passwd)
+        {
+            // TODO: Use GetIdentities to find the md5hash identity for principalID
+            // and then update it with AddIdentity
+            m_log.Error("[AUTH CONNECTOR]: Changing passwords is not implemented yet");
+            return false;
+        }
+
+        private string Authorize(UUID userID)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "AddSession" },
+                { "UserID", userID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+                return response["SessionID"].AsUUID().ToString();
+            else
+                return String.Empty;
+        }
+    }
+}
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
new file mode 100644
index 0000000..a18cb22
--- /dev/null
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.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.Collections.Specialized;
+using System.IO;
+using System.Net;
+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.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
+namespace OpenSim.Services.Connectors.SimianGrid
+{
+    /// <summary>
+    /// Connects avatar appearance data to the SimianGrid backend
+    /// </summary>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class SimianAvatarServiceConnector : IAvatarService, ISharedRegionModule
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+        private static string ZeroID = UUID.Zero.ToString();
+
+        private string m_serverUrl = String.Empty;
+
+        #region ISharedRegionModule
+
+        public Type ReplaceableInterface { get { return null; } }
+        public void RegionLoaded(Scene scene) { }
+        public void PostInitialise() { }
+        public void Close() { }
+
+        public SimianAvatarServiceConnector() { }
+        public string Name { get { return "SimianAvatarServiceConnector"; } }
+        public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.RegisterModuleInterface<IAvatarService>(this); } }
+        public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.UnregisterModuleInterface<IAvatarService>(this); } }
+
+        #endregion ISharedRegionModule
+
+        public SimianAvatarServiceConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            if (Simian.IsSimianEnabled(source, "AvatarServices"))
+            {
+                IConfig gridConfig = source.Configs["AvatarService"];
+                if (gridConfig == null)
+                {
+                    m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini");
+                    throw new Exception("Avatar connector init error");
+                }
+
+                string serviceUrl = gridConfig.GetString("AvatarServerURI");
+                if (String.IsNullOrEmpty(serviceUrl))
+                {
+                    m_log.Error("[AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService");
+                    throw new Exception("Avatar connector init error");
+                }
+
+                if (!serviceUrl.EndsWith("/"))
+                    serviceUrl = serviceUrl + '/';
+
+                m_serverUrl = serviceUrl;
+            }
+        }
+
+        #region IAvatarService
+
+        public AvatarData GetAvatar(UUID userID)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetUser" },
+                { "UserID", userID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+            {
+                OSDMap map = null;
+                try { map = OSDParser.DeserializeJson(response["LLAppearance"].AsString()) as OSDMap; }
+                catch { }
+
+                if (map != null)
+                {
+                    AvatarWearable[] wearables = new AvatarWearable[13];
+                    wearables[0] = new AvatarWearable(map["ShapeItem"].AsUUID(), map["ShapeAsset"].AsUUID());
+                    wearables[1] = new AvatarWearable(map["SkinItem"].AsUUID(), map["SkinAsset"].AsUUID());
+                    wearables[2] = new AvatarWearable(map["HairItem"].AsUUID(), map["HairAsset"].AsUUID());
+                    wearables[3] = new AvatarWearable(map["EyesItem"].AsUUID(), map["EyesAsset"].AsUUID());
+                    wearables[4] = new AvatarWearable(map["ShirtItem"].AsUUID(), map["ShirtAsset"].AsUUID());
+                    wearables[5] = new AvatarWearable(map["PantsItem"].AsUUID(), map["PantsAsset"].AsUUID());
+                    wearables[6] = new AvatarWearable(map["ShoesItem"].AsUUID(), map["ShoesAsset"].AsUUID());
+                    wearables[7] = new AvatarWearable(map["SocksItem"].AsUUID(), map["SocksAsset"].AsUUID());
+                    wearables[8] = new AvatarWearable(map["JacketItem"].AsUUID(), map["JacketAsset"].AsUUID());
+                    wearables[9] = new AvatarWearable(map["GlovesItem"].AsUUID(), map["GlovesAsset"].AsUUID());
+                    wearables[10] = new AvatarWearable(map["UndershirtItem"].AsUUID(), map["UndershirtAsset"].AsUUID());
+                    wearables[11] = new AvatarWearable(map["UnderpantsItem"].AsUUID(), map["UnderpantsAsset"].AsUUID());
+                    wearables[12] = new AvatarWearable(map["SkirtItem"].AsUUID(), map["SkirtAsset"].AsUUID());
+
+                    AvatarAppearance appearance = new AvatarAppearance(userID);
+                    appearance.Wearables = wearables;
+                    appearance.AvatarHeight = (float)map["Height"].AsReal();
+
+                    AvatarData avatar = new AvatarData(appearance);
+                    
+                    // Get attachments
+                    map = null;
+                    try { map = OSDParser.DeserializeJson(response["LLAttachments"].AsString()) as OSDMap; }
+                    catch { }
+
+                    if (map != null)
+                    {
+                        foreach (KeyValuePair<string, OSD> kvp in map)
+                            avatar.Data[kvp.Key] = kvp.Value.AsString();
+                    }
+
+                    return avatar;
+                }
+                else
+                {
+                    m_log.Warn("[AVATAR CONNECTOR]: Failed to get user appearance for " + userID +
+                        ", LLAppearance is missing or invalid");
+                    return null;
+                }
+            }
+            else
+            {
+                m_log.Warn("[AVATAR CONNECTOR]: Failed to get user appearance for " + userID + ": " +
+                    response["Message"].AsString());
+            }
+
+            return null;
+        }
+
+        public bool SetAvatar(UUID userID, AvatarData avatar)
+        {
+            m_log.Debug("[AVATAR CONNECTOR]: SetAvatar called for " + userID);
+
+            if (avatar.AvatarType == 1) // LLAvatar
+            {
+                AvatarAppearance appearance = avatar.ToAvatarAppearance(userID);
+
+                OSDMap map = new OSDMap();
+
+                map["Height"] = OSD.FromReal(appearance.AvatarHeight);
+
+                map["ShapeItem"] = OSD.FromUUID(appearance.BodyItem);
+                map["ShapeAsset"] = OSD.FromUUID(appearance.BodyAsset);
+                map["SkinItem"] = OSD.FromUUID(appearance.SkinItem);
+                map["SkinAsset"] = OSD.FromUUID(appearance.SkinAsset);
+                map["HairItem"] = OSD.FromUUID(appearance.HairItem);
+                map["HairAsset"] = OSD.FromUUID(appearance.HairAsset);
+                map["EyesItem"] = OSD.FromUUID(appearance.EyesItem);
+                map["EyesAsset"] = OSD.FromUUID(appearance.EyesAsset);
+                map["ShirtItem"] = OSD.FromUUID(appearance.ShirtItem);
+                map["ShirtAsset"] = OSD.FromUUID(appearance.ShirtAsset);
+                map["PantsItem"] = OSD.FromUUID(appearance.PantsItem);
+                map["PantsAsset"] = OSD.FromUUID(appearance.PantsAsset);
+                map["ShoesItem"] = OSD.FromUUID(appearance.ShoesItem);
+                map["ShoesAsset"] = OSD.FromUUID(appearance.ShoesAsset);
+                map["SocksItem"] = OSD.FromUUID(appearance.SocksItem);
+                map["SocksAsset"] = OSD.FromUUID(appearance.SocksAsset);
+                map["JacketItem"] = OSD.FromUUID(appearance.JacketItem);
+                map["JacketAsset"] = OSD.FromUUID(appearance.JacketAsset);
+                map["GlovesItem"] = OSD.FromUUID(appearance.GlovesItem);
+                map["GlovesAsset"] = OSD.FromUUID(appearance.GlovesAsset);
+                map["UndershirtItem"] = OSD.FromUUID(appearance.UnderShirtItem);
+                map["UndershirtAsset"] = OSD.FromUUID(appearance.UnderShirtAsset);
+                map["UnderpantsItem"] = OSD.FromUUID(appearance.UnderPantsItem);
+                map["UnderpantsAsset"] = OSD.FromUUID(appearance.UnderPantsAsset);
+                map["SkirtItem"] = OSD.FromUUID(appearance.SkirtItem);
+                map["SkirtAsset"] = OSD.FromUUID(appearance.SkirtAsset);
+
+                OSDMap items = new OSDMap();
+                foreach (KeyValuePair<string, string> kvp in avatar.Data)
+                {
+                    if (kvp.Key.StartsWith("_ap_"))
+                        items.Add(kvp.Key, OSD.FromString(kvp.Value));
+                }
+
+                NameValueCollection requestArgs = new NameValueCollection
+                {
+                    { "RequestMethod", "AddUserData" },
+                    { "UserID", userID.ToString() },
+                    { "LLAppearance", OSDParser.SerializeJsonString(map) },
+                    { "LLAttachments", OSDParser.SerializeJsonString(items) }
+                };
+
+                OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+                bool success = response["Success"].AsBoolean();
+
+                if (!success)
+                    m_log.Warn("[AVATAR CONNECTOR]: Failed saving appearance for " + userID + ": " + response["Message"].AsString());
+
+                return success;
+            }
+            else
+            {
+                m_log.Error("[AVATAR CONNECTOR]: Can't save appearance for " + userID + ". Unhandled avatar type " + avatar.AvatarType);
+                return false;
+            }
+        }
+
+        public bool ResetAvatar(UUID userID)
+        {
+            m_log.Error("[AVATAR CONNECTOR]: ResetAvatar called for " + userID + ", implement this");
+            return false;
+        }
+
+        public bool SetItems(UUID userID, string[] names, string[] values)
+        {
+            m_log.Error("[AVATAR CONNECTOR]: SetItems called for " + userID + " with " + names.Length + " names and " + values.Length + " values, implement this");
+            return false;
+        }
+
+        public bool RemoveItems(UUID userID, string[] names)
+        {
+            m_log.Error("[AVATAR CONNECTOR]: RemoveItems called for " + userID + " with " + names.Length + " names, implement this");
+            return false;
+        }
+
+        #endregion IAvatarService
+    }
+}
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
new file mode 100644
index 0000000..b3ecc7e
--- /dev/null
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
@@ -0,0 +1,232 @@
+/*
+ * 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.Reflection;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+
+using FriendInfo = OpenSim.Services.Interfaces.FriendInfo;
+
+namespace OpenSim.Services.Connectors.SimianGrid
+{
+    /// <summary>
+    /// Stores and retrieves friend lists from the SimianGrid backend
+    /// </summary>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class SimianFriendsServiceConnector : IFriendsService, ISharedRegionModule
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_serverUrl = String.Empty;
+
+        #region ISharedRegionModule
+
+        public Type ReplaceableInterface { get { return null; } }
+        public void RegionLoaded(Scene scene) { }
+        public void PostInitialise() { }
+        public void Close() { }
+
+        public SimianFriendsServiceConnector() { }
+        public string Name { get { return "SimianFriendsServiceConnector"; } }
+        public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.RegisterModuleInterface<IFriendsService>(this); } }
+        public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.UnregisterModuleInterface<IFriendsService>(this); } }
+
+        #endregion ISharedRegionModule
+
+        public SimianFriendsServiceConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            if (Simian.IsSimianEnabled(source, "FriendsServices"))
+            {
+                IConfig assetConfig = source.Configs["FriendsService"];
+                if (assetConfig == null)
+                {
+                    m_log.Error("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini");
+                    throw new Exception("Friends connector init error");
+                }
+
+                string serviceURI = assetConfig.GetString("FriendsServerURI");
+                if (String.IsNullOrEmpty(serviceURI))
+                {
+                    m_log.Error("[FRIENDS CONNECTOR]: No Server URI named in section FriendsService");
+                    throw new Exception("Friends connector init error");
+                }
+
+                m_serverUrl = serviceURI;
+            }
+        }
+
+        #region IFriendsService
+
+        public FriendInfo[] GetFriends(UUID principalID)
+        {
+            Dictionary<UUID, FriendInfo> friends = new Dictionary<UUID, FriendInfo>();
+
+            OSDArray friendsArray = GetFriended(principalID);
+            OSDArray friendedMeArray = GetFriendedBy(principalID);
+
+            // Load the list of friends and their granted permissions
+            for (int i = 0; i < friendsArray.Count; i++)
+            {
+                OSDMap friendEntry = friendsArray[i] as OSDMap;
+                if (friendEntry != null)
+                {
+                    UUID friendID = friendEntry["Key"].AsUUID();
+
+                    FriendInfo friend = new FriendInfo();
+                    friend.PrincipalID = principalID;
+                    friend.Friend = friendID.ToString();
+                    friend.MyFlags = friendEntry["Value"].AsInteger();
+                    friend.TheirFlags = -1;
+
+                    friends[friendID] = friend;
+                }
+            }
+
+            // Load the permissions those friends have granted to this user
+            for (int i = 0; i < friendedMeArray.Count; i++)
+            {
+                OSDMap friendedMeEntry = friendedMeArray[i] as OSDMap;
+                if (friendedMeEntry != null)
+                {
+                    UUID friendID = friendedMeEntry["OwnerID"].AsUUID();
+
+                    FriendInfo friend;
+                    if (friends.TryGetValue(friendID, out friend))
+                        friend.TheirFlags = friendedMeEntry["Value"].AsInteger();
+                }
+            }
+
+            // Convert the dictionary of friends to an array and return it
+            FriendInfo[] array = new FriendInfo[friends.Count];
+            int j = 0;
+            foreach (FriendInfo friend in friends.Values)
+                array[j++] = friend;
+
+            return array;
+        }
+
+        public bool StoreFriend(UUID principalID, string friend, int flags)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "AddGeneric" },
+                { "OwnerID", principalID.ToString() },
+                { "Type", "Friend" },
+                { "Key", friend },
+                { "Value", flags.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+                m_log.Error("[FRIENDS CONNECTOR]: Failed to store friend " + friend + " for user " + principalID + ": " + response["Message"].AsString());
+
+            return success;
+        }
+
+        public bool Delete(UUID principalID, string friend)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "RemoveGeneric" },
+                { "OwnerID", principalID.ToString() },
+                { "Type", "Friend" },
+                { "Key", friend }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+                m_log.Error("[FRIENDS CONNECTOR]: Failed to remove friend " + friend + " for user " + principalID + ": " + response["Message"].AsString());
+
+            return success;
+        }
+
+        #endregion IFriendsService
+
+        private OSDArray GetFriended(UUID ownerID)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetGenerics" },
+                { "OwnerID", ownerID.ToString() },
+                { "Type", "Friend" }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean() && response["Entries"] is OSDArray)
+            {
+                return (OSDArray)response["Entries"];
+            }
+            else
+            {
+                m_log.Warn("[FRIENDS CONNECTOR]: Failed to retrieve friends for user " + ownerID + ": " + response["Message"].AsString());
+                return new OSDArray(0);
+            }
+        }
+
+        private OSDArray GetFriendedBy(UUID ownerID)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetGenerics" },
+                { "Key", ownerID.ToString() },
+                { "Type", "Friend" }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean() && response["Entries"] is OSDArray)
+            {
+                return (OSDArray)response["Entries"];
+            }
+            else
+            {
+                m_log.Warn("[FRIENDS CONNECTOR]: Failed to retrieve reverse friends for user " + ownerID + ": " + response["Message"].AsString());
+                return new OSDArray(0);
+            }
+        }
+    }
+}
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
new file mode 100644
index 0000000..c3de98e
--- /dev/null
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.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 Mono.Addins;
+using Nini.Config;
+
+[assembly: Addin("SimianGrid", "1.0")]
+[assembly: AddinDependency("OpenSim", "0.5")]
+
+public static class Simian
+{
+    public static bool IsSimianEnabled(IConfigSource config, string moduleName)
+    {
+        if (config.Configs["Modules"] != null)
+        {
+            string module = config.Configs["Modules"].GetString("AuthenticationServices");
+            return !String.IsNullOrEmpty(module) && module.Contains("Simian");
+        }
+
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
new file mode 100644
index 0000000..eebdf14
--- /dev/null
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -0,0 +1,421 @@
+/*
+ * 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.Net;
+using System.Reflection;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenSim.Server.Base;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+namespace OpenSim.Services.Connectors.SimianGrid
+{
+    /// <summary>
+    /// Connects region registration and neighbor lookups to the SimianGrid
+    /// backend
+    /// </summary>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class SimianGridServiceConnector : IGridService, ISharedRegionModule
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_serverUrl = String.Empty;
+
+        #region ISharedRegionModule
+
+        public Type ReplaceableInterface { get { return null; } }
+        public void RegionLoaded(Scene scene) { }
+        public void PostInitialise() { }
+        public void Close() { }
+
+        public SimianGridServiceConnector() { }
+        public string Name { get { return "SimianGridServiceConnector"; } }
+        public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.RegisterModuleInterface<IGridService>(this); } }
+        public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.UnregisterModuleInterface<IGridService>(this); } }
+
+        #endregion ISharedRegionModule
+
+        public SimianGridServiceConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            if (Simian.IsSimianEnabled(source, "GridServices"))
+            {
+                IConfig gridConfig = source.Configs["GridService"];
+                if (gridConfig == null)
+                {
+                    m_log.Error("[GRID CONNECTOR]: GridService missing from OpenSim.ini");
+                    throw new Exception("Grid connector init error");
+                }
+
+                string serviceUrl = gridConfig.GetString("GridServerURI");
+                if (String.IsNullOrEmpty(serviceUrl))
+                {
+                    m_log.Error("[GRID CONNECTOR]: No Server URI named in section GridService");
+                    throw new Exception("Grid connector init error");
+                }
+
+                m_serverUrl = serviceUrl;
+            }
+        }
+
+        #region IGridService
+
+        public string RegisterRegion(UUID scopeID, GridRegion regionInfo)
+        {
+            Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0);
+            Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, 4096.0);
+
+            string httpAddress = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/";
+
+            OSDMap extraData = new OSDMap
+            {
+                { "ServerURI", OSD.FromString(regionInfo.ServerURI) },
+                { "InternalAddress", OSD.FromString(regionInfo.InternalEndPoint.Address.ToString()) },
+                { "InternalPort", OSD.FromInteger(regionInfo.InternalEndPoint.Port) },
+                { "ExternalAddress", OSD.FromString(regionInfo.ExternalEndPoint.Address.ToString()) },
+                { "ExternalPort", OSD.FromInteger(regionInfo.ExternalEndPoint.Port) },
+                { "MapTexture", OSD.FromUUID(regionInfo.TerrainImage) },
+                { "Access", OSD.FromInteger(regionInfo.Access) },
+                { "RegionSecret", OSD.FromString(regionInfo.RegionSecret) },
+                { "EstateOwner", OSD.FromUUID(regionInfo.EstateOwner) },
+                { "Token", OSD.FromString(regionInfo.Token) }
+            };
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "AddScene" },
+                { "SceneID", regionInfo.RegionID.ToString() },
+                { "Name", regionInfo.RegionName },
+                { "MinPosition", minPosition.ToString() },
+                { "MaxPosition", maxPosition.ToString() },
+                { "Address", httpAddress },
+                { "Enabled", "1" },
+                { "ExtraData", OSDParser.SerializeJsonString(extraData) }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+                return String.Empty;
+            else
+                return "Region registration for " + regionInfo.RegionName + " failed: " + response["Message"].AsString();
+        }
+
+        public bool DeregisterRegion(UUID regionID)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "AddScene" },
+                { "SceneID", regionID.ToString() },
+                { "Enabled", "0" }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+                m_log.Warn("[GRID CONNECTOR]: Region deregistration for " + regionID + " failed: " + response["Message"].AsString());
+
+            return success;
+        }
+
+        public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
+        {
+            const int NEIGHBOR_RADIUS = 128;
+
+            GridRegion region = GetRegionByUUID(scopeID, regionID);
+
+            if (region != null)
+            {
+                List<GridRegion> regions = GetRegionRange(scopeID,
+                    region.RegionLocX - NEIGHBOR_RADIUS, region.RegionLocX + (int)Constants.RegionSize + NEIGHBOR_RADIUS,
+                    region.RegionLocY - NEIGHBOR_RADIUS, region.RegionLocY + (int)Constants.RegionSize + NEIGHBOR_RADIUS);
+
+                for (int i = 0; i < regions.Count; i++)
+                {
+                    if (regions[i].RegionID == regionID)
+                    {
+                        regions.RemoveAt(i);
+                        break;
+                    }
+                }
+
+                m_log.Debug("[GRID CONNECTOR]: Found " + regions.Count + " neighbors for region " + regionID);
+                return regions;
+            }
+
+            return new List<GridRegion>(0);
+        }
+
+        public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetScene" },
+                { "SceneID", regionID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+            {
+                return ResponseToGridRegion(response);
+            }
+            else
+            {
+                m_log.Warn("[GRID CONNECTOR]: Grid service did not find a match for region " + regionID);
+                return null;
+            }
+        }
+
+        public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
+        {
+            // Go one meter in from the requested x/y coords to avoid requesting a position
+            // that falls on the border of two sims
+            Vector3d position = new Vector3d(x + 1, y + 1, 0.0);
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetScene" },
+                { "Position", position.ToString() },
+                { "Enabled", "1" }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+            {
+                return ResponseToGridRegion(response);
+            }
+            else
+            {
+                //m_log.InfoFormat("[GRID CONNECTOR]: Grid service did not find a match for region at {0},{1}",
+                //    x / Constants.RegionSize, y / Constants.RegionSize);
+                return null;
+            }
+        }
+
+        public GridRegion GetRegionByName(UUID scopeID, string regionName)
+        {
+            List<GridRegion> regions = GetRegionsByName(scopeID, regionName, 1);
+
+            m_log.Debug("[GRID CONNECTOR]: Got " + regions.Count + " matches for region name " + regionName);
+
+            if (regions.Count > 0)
+                return regions[0];
+
+            return null;
+        }
+
+        public List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
+        {
+            List<GridRegion> foundRegions = new List<GridRegion>();
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetScenes" },
+                { "NameQuery", name },
+                { "Enabled", "1" }
+            };
+            if (maxNumber > 0)
+                requestArgs["MaxNumber"] = maxNumber.ToString();
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+            {
+                OSDArray array = response["Scenes"] as OSDArray;
+                if (array != null)
+                {
+                    for (int i = 0; i < array.Count; i++)
+                    {
+                        GridRegion region = ResponseToGridRegion(array[i] as OSDMap);
+                        if (region != null)
+                            foundRegions.Add(region);
+                    }
+                }
+            }
+
+            return foundRegions;
+        }
+
+        public List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax)
+        {
+            List<GridRegion> foundRegions = new List<GridRegion>();
+
+            Vector3d minPosition = new Vector3d(xmin, ymin, 0.0);
+            Vector3d maxPosition = new Vector3d(xmax, ymax, 4096.0);
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetScenes" },
+                { "MinPosition", minPosition.ToString() },
+                { "MaxPosition", maxPosition.ToString() },
+                { "Enabled", "1" }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+            {
+                OSDArray array = response["Scenes"] as OSDArray;
+                if (array != null)
+                {
+                    for (int i = 0; i < array.Count; i++)
+                    {
+                        GridRegion region = ResponseToGridRegion(array[i] as OSDMap);
+                        if (region != null)
+                            foundRegions.Add(region);
+                    }
+                }
+            }
+
+            return foundRegions;
+        }
+
+        public List<GridRegion> GetDefaultRegions(UUID scopeID)
+        {
+            // TODO: Allow specifying the default grid location
+            const int DEFAULT_X = 1000 * 256;
+            const int DEFAULT_Y = 1000 * 256;
+
+            GridRegion defRegion = GetNearestRegion(new Vector3d(DEFAULT_X, DEFAULT_Y, 0.0), true);
+            if (defRegion != null)
+                return new List<GridRegion>(1) { defRegion };
+            else
+                return new List<GridRegion>(0);
+        }
+
+        public List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y)
+        {
+            GridRegion defRegion = GetNearestRegion(new Vector3d(x, y, 0.0), true);
+            if (defRegion != null)
+                return new List<GridRegion>(1) { defRegion };
+            else
+                return new List<GridRegion>(0);
+        }
+
+        public int GetRegionFlags(UUID scopeID, UUID regionID)
+        {
+            const int REGION_ONLINE = 4;
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetScene" },
+                { "SceneID", regionID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+            {
+                return response["Enabled"].AsBoolean() ? REGION_ONLINE : 0;
+            }
+            else
+            {
+                m_log.Warn("[GRID CONNECTOR]: Grid service did not find a match for region " + regionID + " during region flags check");
+                return -1;
+            }
+        }
+
+        #endregion IGridService
+
+        private GridRegion GetNearestRegion(Vector3d position, bool onlyEnabled)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetScene" },
+                { "Position", position.ToString() },
+                { "FindClosest", "1" }
+            };
+            if (onlyEnabled)
+                requestArgs["Enabled"] = "1";
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+            {
+                return ResponseToGridRegion(response);
+            }
+            else
+            {
+                m_log.Warn("[GRID CONNECTOR]: Grid service did not find a match for region at " + position);
+                return null;
+            }
+        }
+
+        private GridRegion ResponseToGridRegion(OSDMap response)
+        {
+            if (response == null)
+                return null;
+
+            OSDMap extraData = response["ExtraData"] as OSDMap;
+            if (extraData == null)
+                return null;
+
+            GridRegion region = new GridRegion();
+
+            region.RegionID = response["SceneID"].AsUUID();
+            region.RegionName = response["Name"].AsString();
+
+            Vector3d minPosition = response["MinPosition"].AsVector3d();
+            region.RegionLocX = (int)minPosition.X;
+            region.RegionLocY = (int)minPosition.Y;
+
+            Uri httpAddress = response["Address"].AsUri();
+            region.ExternalHostName = httpAddress.Host;
+            region.HttpPort = (uint)httpAddress.Port;
+
+            region.ServerURI = extraData["ServerURI"].AsString();
+
+            IPAddress internalAddress;
+            IPAddress.TryParse(extraData["InternalAddress"].AsString(), out internalAddress);
+            if (internalAddress == null)
+                internalAddress = IPAddress.Any;
+
+            region.InternalEndPoint = new IPEndPoint(internalAddress, extraData["InternalPort"].AsInteger());
+            region.TerrainImage = extraData["MapTexture"].AsUUID();
+            region.Access = (byte)extraData["Access"].AsInteger();
+            region.RegionSecret = extraData["RegionSecret"].AsString();
+            region.EstateOwner = extraData["EstateOwner"].AsUUID();
+            region.Token = extraData["Token"].AsString();
+
+            return region;
+        }
+    }
+}
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
new file mode 100644
index 0000000..891782f
--- /dev/null
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -0,0 +1,895 @@
+/*
+ * 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.Reflection;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+
+namespace OpenSim.Services.Connectors.SimianGrid
+{
+    /// <summary>
+    /// Permissions bitflags
+    /// </summary>
+    [Flags]
+    public enum PermissionMask : uint
+    {
+        None = 0,
+        Transfer = 1 << 13,
+        Modify = 1 << 14,
+        Copy = 1 << 15,
+        Move = 1 << 19,
+        Damage = 1 << 20,
+        All = 0x7FFFFFFF
+    }
+
+    /// <summary>
+    /// Connects avatar inventories to the SimianGrid backend
+    /// </summary>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class SimianInventoryServiceConnector : IInventoryService, ISharedRegionModule
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_serverUrl = String.Empty;
+        private string m_userServerUrl = String.Empty;
+        private object m_gestureSyncRoot = new object();
+
+        #region ISharedRegionModule
+
+        public Type ReplaceableInterface { get { return null; } }
+        public void RegionLoaded(Scene scene) { }
+        public void PostInitialise() { }
+        public void Close() { }
+
+        public SimianInventoryServiceConnector() { }
+        public string Name { get { return "SimianInventoryServiceConnector"; } }
+        public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.RegisterModuleInterface<IInventoryService>(this); } }
+        public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.UnregisterModuleInterface<IInventoryService>(this); } }
+
+        #endregion ISharedRegionModule
+
+        public SimianInventoryServiceConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            if (Simian.IsSimianEnabled(source, "InventoryServices"))
+            {
+                IConfig gridConfig = source.Configs["InventoryService"];
+                if (gridConfig == null)
+                {
+                    m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini");
+                    throw new Exception("Inventory connector init error");
+                }
+
+                string serviceUrl = gridConfig.GetString("InventoryServerURI");
+                if (String.IsNullOrEmpty(serviceUrl))
+                {
+                    m_log.Error("[INVENTORY CONNECTOR]: No Server URI named in section InventoryService");
+                    throw new Exception("Inventory connector init error");
+                }
+
+                m_serverUrl = serviceUrl;
+
+                gridConfig = source.Configs["UserAccountService"];
+                if (gridConfig != null)
+                {
+                    serviceUrl = gridConfig.GetString("UserAccountServerURI");
+                    if (!String.IsNullOrEmpty(serviceUrl))
+                        m_userServerUrl = serviceUrl;
+                    else
+                        m_log.Info("[INVENTORY CONNECTOR]: No Server URI named in section UserAccountService");
+                }
+                else
+                {
+                    m_log.Warn("[INVENTORY CONNECTOR]: UserAccountService missing from OpenSim.ini");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Create the entire inventory for a given user
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public bool CreateUserInventory(UUID userID)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "AddInventory" },
+                { "OwnerID", userID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+                m_log.Warn("[INVENTORY CONNECTOR]: Inventory creation for " + userID + " failed: " + response["Message"].AsString());
+
+            return success;
+        }
+
+        /// <summary>
+        /// Gets the skeleton of the inventory -- folders only
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <returns></returns>
+        public List<InventoryFolderBase> GetInventorySkeleton(UUID userID)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetInventoryNode" },
+                { "ItemID", userID.ToString() },
+                { "OwnerID", userID.ToString() },
+                { "IncludeFolders", "1" },
+                { "IncludeItems", "0" },
+                { "ChildrenOnly", "0" }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
+            {
+                OSDArray items = (OSDArray)response["Items"];
+                return GetFoldersFromResponse(items, userID, true);
+            }
+            else
+            {
+                m_log.Warn("[INVENTORY CONNECTOR]: Failed to retrieve inventory skeleton for " + userID + ": " +
+                    response["Message"].AsString());
+                return new List<InventoryFolderBase>(0);
+            }
+        }
+
+        /// <summary>
+        /// Synchronous inventory fetch.
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <returns></returns>
+        [Obsolete]
+        public InventoryCollection GetUserInventory(UUID userID)
+        {
+            m_log.Error("[INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID);
+
+            InventoryCollection inventory = new InventoryCollection();
+            inventory.UserID = userID;
+            inventory.Folders = new List<InventoryFolderBase>();
+            inventory.Items = new List<InventoryItemBase>();
+
+            return inventory;
+        }
+
+        /// <summary>
+        /// Request the inventory for a user.  This is an asynchronous operation that will call the callback when the
+        /// inventory has been received
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="callback"></param>
+        [Obsolete]
+        public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
+        {
+            m_log.Error("[INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID);
+            callback(new List<InventoryFolderImpl>(0), new List<InventoryItemBase>(0));
+        }
+
+        /// <summary>
+        /// Retrieve the root inventory folder for the given user.
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <returns>null if no root folder was found</returns>
+        public InventoryFolderBase GetRootFolder(UUID userID)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetInventoryNode" },
+                { "ItemID", userID.ToString() },
+                { "OwnerID", userID.ToString() },
+                { "IncludeFolders", "1" },
+                { "IncludeItems", "0" },
+                { "ChildrenOnly", "1" }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
+            {
+                OSDArray items = (OSDArray)response["Items"];
+                List<InventoryFolderBase> folders = GetFoldersFromResponse(items, userID, true);
+
+                if (folders.Count > 0)
+                    return folders[0];
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the user folder for the given folder-type
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
+        {
+            string contentType = SLUtil.SLAssetTypeToContentType((int)type);
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetFolderForType" },
+                { "ContentType", contentType },
+                { "OwnerID", userID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean() && response["Folder"] is OSDMap)
+            {
+                OSDMap folder = (OSDMap)response["Folder"];
+
+                return new InventoryFolderBase(
+                    folder["ID"].AsUUID(),
+                    folder["Name"].AsString(),
+                    folder["OwnerID"].AsUUID(),
+                    (short)SLUtil.ContentTypeToSLAssetType(folder["ContentType"].AsString()),
+                    folder["ParentID"].AsUUID(),
+                    (ushort)folder["Version"].AsInteger()
+                );
+            }
+            else
+            {
+                m_log.Warn("[INVENTORY CONNECTOR]: Default folder not found for content type " + contentType);
+                return GetRootFolder(userID);
+            }
+        }
+
+        /// <summary>
+        /// Get an item, given by its UUID
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns></returns>
+        public InventoryItemBase GetItem(InventoryItemBase item)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetInventoryNode" },
+                { "ItemID", item.ID.ToString() },
+                { "OwnerID", item.Owner.ToString() },
+                { "IncludeFolders", "1" },
+                { "IncludeItems", "1" },
+                { "ChildrenOnly", "1" }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
+            {
+                List<InventoryItemBase> items = GetItemsFromResponse((OSDArray)response["Items"]);
+                if (items.Count > 0)
+                {
+                    // The requested item should be the first in this list, but loop through
+                    // and sanity check just in case
+                    for (int i = 0; i < items.Count; i++)
+                    {
+                        if (items[i].ID == item.ID)
+                            return items[i];
+                    }
+                }
+            }
+
+            m_log.Warn("[INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found");
+            return null;
+        }
+
+        /// <summary>
+        /// Get a folder, given by its UUID
+        /// </summary>
+        /// <param name="folder"></param>
+        /// <returns></returns>
+        public InventoryFolderBase GetFolder(InventoryFolderBase folder)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetInventoryNode" },
+                { "ItemID", folder.ID.ToString() },
+                { "OwnerID", folder.Owner.ToString() },
+                { "IncludeFolders", "1" },
+                { "IncludeItems", "0" },
+                { "ChildrenOnly", "1" }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
+            {
+                OSDArray items = (OSDArray)response["Items"];
+                List<InventoryFolderBase> folders = GetFoldersFromResponse(items, folder.ID, true);
+
+                if (folders.Count > 0)
+                    return folders[0];
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets everything (folders and items) inside a folder
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="folderID"></param>
+        /// <returns></returns>
+        public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
+        {
+            InventoryCollection inventory = new InventoryCollection();
+            inventory.UserID = userID;
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetInventoryNode" },
+                { "ItemID", folderID.ToString() },
+                { "OwnerID", userID.ToString() },
+                { "IncludeFolders", "1" },
+                { "IncludeItems", "1" },
+                { "ChildrenOnly", "1" }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
+            {
+                OSDArray items = (OSDArray)response["Items"];
+
+                inventory.Folders = GetFoldersFromResponse(items, folderID, false);
+                inventory.Items = GetItemsFromResponse(items);
+            }
+            else
+            {
+                m_log.Warn("[INVENTORY CONNECTOR]: Error fetching folder " + folderID + " content for " + userID + ": " +
+                    response["Message"].AsString());
+                inventory.Folders = new List<InventoryFolderBase>(0);
+                inventory.Items = new List<InventoryItemBase>(0);
+            }
+
+            return inventory;
+        }
+
+        /// <summary>
+        /// Gets the items inside a folder
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="folderID"></param>
+        /// <returns></returns>
+        public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
+        {
+            InventoryCollection inventory = new InventoryCollection();
+            inventory.UserID = userID;
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetInventoryNode" },
+                { "ItemID", folderID.ToString() },
+                { "OwnerID", userID.ToString() },
+                { "IncludeFolders", "0" },
+                { "IncludeItems", "1" },
+                { "ChildrenOnly", "1" }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
+            {
+                OSDArray items = (OSDArray)response["Items"];
+                return GetItemsFromResponse(items);
+            }
+            else
+            {
+                m_log.Warn("[INVENTORY CONNECTOR]: Error fetching folder " + folderID + " for " + userID + ": " +
+                    response["Message"].AsString());
+                return new List<InventoryItemBase>(0);
+            }
+        }
+
+        /// <summary>
+        /// Add a new folder to the user's inventory
+        /// </summary>
+        /// <param name="folder"></param>
+        /// <returns>true if the folder was successfully added</returns>
+        public bool AddFolder(InventoryFolderBase folder)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "AddInventoryFolder" },
+                { "FolderID", folder.ID.ToString() },
+                { "ParentID", folder.ParentID.ToString() },
+                { "OwnerID", folder.Owner.ToString() },
+                { "Name", folder.Name },
+                { "ContentType", SLUtil.SLAssetTypeToContentType(folder.Type) }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+            {
+                m_log.Warn("[INVENTORY CONNECTOR]: Error creating folder " + folder.Name + " for " + folder.Owner + ": " +
+                    response["Message"].AsString());
+            }
+
+            return success;
+        }
+
+        /// <summary>
+        /// Update a folder in the user's inventory
+        /// </summary>
+        /// <param name="folder"></param>
+        /// <returns>true if the folder was successfully updated</returns>
+        public bool UpdateFolder(InventoryFolderBase folder)
+        {
+            return AddFolder(folder);
+        }
+
+        /// <summary>
+        /// Move an inventory folder to a new location
+        /// </summary>
+        /// <param name="folder">A folder containing the details of the new location</param>
+        /// <returns>true if the folder was successfully moved</returns>
+        public bool MoveFolder(InventoryFolderBase folder)
+        {
+            return AddFolder(folder);
+        }
+
+        /// <summary>
+        /// Delete an item from the user's inventory
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns>true if the item was successfully deleted</returns>
+        //bool DeleteItem(InventoryItemBase item);
+        public bool DeleteFolders(UUID userID, List<UUID> folderIDs)
+        {
+            return DeleteItems(userID, folderIDs);
+        }
+
+        /// <summary>
+        /// Delete an item from the user's inventory
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns>true if the item was successfully deleted</returns>
+        public bool DeleteItems(UUID userID, List<UUID> itemIDs)
+        {
+            // TODO: RemoveInventoryNode should be replaced with RemoveInventoryNodes
+            bool allSuccess = true;
+
+            for (int i = 0; i < itemIDs.Count; i++)
+            {
+                UUID itemID = itemIDs[i];
+
+                NameValueCollection requestArgs = new NameValueCollection
+                {
+                    { "RequestMethod", "RemoveInventoryNode" },
+                    { "OwnerID", userID.ToString() },
+                    { "ItemID", itemID.ToString() }
+                };
+
+                OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+                bool success = response["Success"].AsBoolean();
+
+                if (!success)
+                {
+                    m_log.Warn("[INVENTORY CONNECTOR]: Error removing item " + itemID + " for " + userID + ": " +
+                        response["Message"].AsString());
+                    allSuccess = false;
+                }
+            }
+            
+            return allSuccess;
+        }
+
+        /// <summary>
+        /// Purge an inventory folder of all its items and subfolders.
+        /// </summary>
+        /// <param name="folder"></param>
+        /// <returns>true if the folder was successfully purged</returns>
+        public bool PurgeFolder(InventoryFolderBase folder)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "PurgeInventoryFolder" },
+                { "OwnerID", folder.Owner.ToString() },
+                { "FolderID", folder.ID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+            {
+                m_log.Warn("[INVENTORY CONNECTOR]: Error purging folder " + folder.ID + " for " + folder.Owner + ": " +
+                    response["Message"].AsString());
+            }
+
+            return success;
+        }
+
+        /// <summary>
+        /// Add a new item to the user's inventory
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns>true if the item was successfully added</returns>
+        public bool AddItem(InventoryItemBase item)
+        {
+            // A folder of UUID.Zero means we need to find the most appropriate home for this item
+            if (item.Folder == UUID.Zero)
+            {
+                InventoryFolderBase folder = GetFolderForType(item.Owner, (AssetType)item.AssetType);
+                if (folder != null && folder.ID != UUID.Zero)
+                    item.Folder = folder.ID;
+                else
+                    item.Folder = item.Owner; // Root folder
+            }
+
+            if ((AssetType)item.AssetType == AssetType.Gesture)
+                UpdateGesture(item.Owner, item.ID, item.Flags == 1);
+
+            if (item.BasePermissions == 0)
+                m_log.WarnFormat("[INVENTORY CONNECTOR]: Adding inventory item {0} ({1}) with no base permissions", item.Name, item.ID);
+
+            OSDMap permissions = new OSDMap
+            {
+                { "BaseMask", OSD.FromInteger(item.BasePermissions) },
+                { "EveryoneMask", OSD.FromInteger(item.EveryOnePermissions) },
+                { "GroupMask", OSD.FromInteger(item.GroupPermissions) },
+                { "NextOwnerMask", OSD.FromInteger(item.NextPermissions) },
+                { "OwnerMask", OSD.FromInteger(item.CurrentPermissions) }
+            };
+
+            OSDMap extraData = new OSDMap()
+            {
+                { "Flags", OSD.FromInteger(item.Flags) },
+                { "GroupID", OSD.FromUUID(item.GroupID) },
+                { "GroupOwned", OSD.FromBoolean(item.GroupOwned) },
+                { "SalePrice", OSD.FromInteger(item.SalePrice) },
+                { "SaleType", OSD.FromInteger(item.SaleType) },
+                { "Permissions", permissions }
+            };
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "AddInventoryItem" },
+                { "ItemID", item.ID.ToString() },
+                { "AssetID", item.AssetID.ToString() },
+                { "ParentID", item.Folder.ToString() },
+                { "OwnerID", item.Owner.ToString() },
+                { "Name", item.Name },
+                { "Description", item.Description },
+                { "CreatorID", item.CreatorId },
+                { "ExtraData", OSDParser.SerializeJsonString(extraData) }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+            {
+                m_log.Warn("[INVENTORY CONNECTOR]: Error creating item " + item.Name + " for " + item.Owner + ": " +
+                    response["Message"].AsString());
+            }
+
+            return success;
+        }
+
+        /// <summary>
+        /// Update an item in the user's inventory
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns>true if the item was successfully updated</returns>
+        public bool UpdateItem(InventoryItemBase item)
+        {
+            if (item.AssetID != UUID.Zero)
+            {
+                return AddItem(item);
+            }
+            else
+            {
+                // This is actually a folder update
+                InventoryFolderBase folder = new InventoryFolderBase(item.ID, item.Name, item.Owner, (short)item.AssetType, item.Folder, 0);
+                return UpdateFolder(folder);
+            }
+        }
+
+        public bool MoveItems(UUID ownerID, List<InventoryItemBase> items)
+        {
+            bool success = true;
+
+            while (items.Count > 0)
+            {
+                List<InventoryItemBase> currentItems = new List<InventoryItemBase>();
+                UUID destFolderID = items[0].Folder;
+
+                // Find all of the items being moved to the current destination folder
+                for (int i = 0; i < items.Count; i++)
+                {
+                    InventoryItemBase item = items[i];
+                    if (item.Folder == destFolderID)
+                        currentItems.Add(item);
+                }
+
+                // Do the inventory move for the current items
+                success &= MoveItems(ownerID, items, destFolderID);
+
+                // Remove the processed items from the list
+                for (int i = 0; i < currentItems.Count; i++)
+                    items.Remove(currentItems[i]);
+            }
+
+            return success;
+        }
+
+        /// <summary>
+        /// Does the given user have an inventory structure?
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <returns></returns>
+        public bool HasInventoryForUser(UUID userID)
+        {
+            return GetRootFolder(userID) != null;
+        }
+
+        /// <summary>
+        /// Get the active gestures of the agent.
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <returns></returns>
+        public List<InventoryItemBase> GetActiveGestures(UUID userID)
+        {
+            OSDArray items = FetchGestures(userID);
+
+            string[] itemIDs = new string[items.Count];
+            for (int i = 0; i < items.Count; i++)
+                itemIDs[i] = items[i].AsUUID().ToString();
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetInventoryNodes" },
+                { "OwnerID", userID.ToString() },
+                { "Items", String.Join(",", itemIDs) }
+            };
+
+            // FIXME: Implement this in SimianGrid
+            return new List<InventoryItemBase>(0);
+        }
+
+        /// <summary>
+        /// Get the union of permissions of all inventory items
+        /// that hold the given assetID. 
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="assetID"></param>
+        /// <returns>The permissions or 0 if no such asset is found in 
+        /// the user's inventory</returns>
+        public int GetAssetPermissions(UUID userID, UUID assetID)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetInventoryNodes" },
+                { "OwnerID", userID.ToString() },
+                { "AssetID", assetID.ToString() }
+            };
+
+            // FIXME: Implement this in SimianGrid
+            return (int)PermissionMask.All;
+        }
+
+        private List<InventoryFolderBase> GetFoldersFromResponse(OSDArray items, UUID baseFolder, bool includeBaseFolder)
+        {
+            List<InventoryFolderBase> invFolders = new List<InventoryFolderBase>(items.Count);
+
+            for (int i = 0; i < items.Count; i++)
+            {
+                OSDMap item = items[i] as OSDMap;
+
+                if (item != null && item["Type"].AsString() == "Folder")
+                {
+                    UUID folderID = item["ID"].AsUUID();
+
+                    if (folderID == baseFolder && !includeBaseFolder)
+                        continue;
+
+                    invFolders.Add(new InventoryFolderBase(
+                        folderID,
+                        item["Name"].AsString(),
+                        item["OwnerID"].AsUUID(),
+                        (short)SLUtil.ContentTypeToSLAssetType(item["ContentType"].AsString()),
+                        item["ParentID"].AsUUID(),
+                        (ushort)item["Version"].AsInteger()
+                    ));
+                }
+            }
+
+            return invFolders;
+        }
+
+        private List<InventoryItemBase> GetItemsFromResponse(OSDArray items)
+        {
+            List<InventoryItemBase> invItems = new List<InventoryItemBase>(items.Count);
+
+            for (int i = 0; i < items.Count; i++)
+            {
+                OSDMap item = items[i] as OSDMap;
+
+                if (item != null && item["Type"].AsString() == "Item")
+                {
+                    InventoryItemBase invItem = new InventoryItemBase();
+                    
+                    invItem.AssetID = item["AssetID"].AsUUID();
+                    invItem.AssetType = SLUtil.ContentTypeToSLAssetType(item["ContentType"].AsString());
+                    invItem.CreationDate = item["CreationDate"].AsInteger();
+                    invItem.CreatorId = item["CreatorID"].AsString();
+                    invItem.CreatorIdAsUuid = item["CreatorID"].AsUUID();
+                    invItem.Description = item["Description"].AsString();
+                    invItem.Folder = item["ParentID"].AsUUID();
+                    invItem.ID = item["ID"].AsUUID();
+                    invItem.InvType = SLUtil.ContentTypeToSLInvType(item["ContentType"].AsString());
+                    invItem.Name = item["Name"].AsString();
+                    invItem.Owner = item["OwnerID"].AsUUID();
+
+                    OSDMap extraData = item["ExtraData"] as OSDMap;
+                    if (extraData != null && extraData.Count > 0)
+                    {
+                        invItem.Flags = extraData["Flags"].AsUInteger();
+                        invItem.GroupID = extraData["GroupID"].AsUUID();
+                        invItem.GroupOwned = extraData["GroupOwned"].AsBoolean();
+                        invItem.SalePrice = extraData["SalePrice"].AsInteger();
+                        invItem.SaleType = (byte)extraData["SaleType"].AsInteger();
+
+                        OSDMap perms = extraData["Permissions"] as OSDMap;
+                        if (perms != null)
+                        {
+                            invItem.BasePermissions = perms["BaseMask"].AsUInteger();
+                            invItem.CurrentPermissions = perms["OwnerMask"].AsUInteger();
+                            invItem.EveryOnePermissions = perms["EveryoneMask"].AsUInteger();
+                            invItem.GroupPermissions = perms["GroupMask"].AsUInteger();
+                            invItem.NextPermissions = perms["NextOwnerMask"].AsUInteger();
+                        }
+                    }
+
+                    if (invItem.BasePermissions == 0)
+                    {
+                        m_log.InfoFormat("[INVENTORY CONNECTOR]: Forcing item permissions to full for item {0} ({1})",
+                            invItem.Name, invItem.ID);
+                        invItem.BasePermissions = (uint)PermissionMask.All;
+                        invItem.CurrentPermissions = (uint)PermissionMask.All;
+                        invItem.EveryOnePermissions = (uint)PermissionMask.All;
+                        invItem.GroupPermissions = (uint)PermissionMask.All;
+                        invItem.NextPermissions = (uint)PermissionMask.All;
+                    }
+
+                    invItems.Add(invItem);
+                }
+            }
+
+            return invItems;
+        }
+
+        private bool MoveItems(UUID ownerID, List<InventoryItemBase> items, UUID destFolderID)
+        {
+            string[] itemIDs = new string[items.Count];
+            for (int i = 0; i < items.Count; i++)
+                itemIDs[i] = items[i].ID.ToString();
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "MoveInventoryNodes" },
+                { "OwnerID", ownerID.ToString() },
+                { "FolderID", destFolderID.ToString() },
+                { "Items", String.Join(",", itemIDs) }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+            {
+                m_log.Warn("[INVENTORY CONNECTOR]: Failed to move " + items.Count + " items to " +
+                    destFolderID + ": " + response["Message"].AsString());
+            }
+
+            return success;
+        }
+
+        private void UpdateGesture(UUID userID, UUID itemID, bool enabled)
+        {
+            OSDArray gestures = FetchGestures(userID);
+            OSDArray newGestures = new OSDArray();
+
+            for (int i = 0; i < gestures.Count; i++)
+            {
+                UUID gesture = gestures[i].AsUUID();
+                if (gesture != itemID)
+                    newGestures.Add(OSD.FromUUID(gesture));
+            }
+
+            if (enabled)
+                newGestures.Add(OSD.FromUUID(itemID));
+
+            SaveGestures(userID, newGestures);
+        }
+
+        private OSDArray FetchGestures(UUID userID)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetUser" },
+                { "UserID", userID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_userServerUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+            {
+                OSDMap user = response["User"] as OSDMap;
+                if (user != null && response.ContainsKey("Gestures"))
+                {
+                    OSD gestures = OSDParser.DeserializeJson(response["Gestures"].AsString());
+                    if (gestures != null && gestures is OSDArray)
+                        return (OSDArray)gestures;
+                    else
+                        m_log.Error("[INVENTORY CONNECTOR]: Unrecognized active gestures data for " + userID);
+                }
+            }
+            else
+            {
+                m_log.Warn("[INVENTORY CONNECTOR]: Failed to fetch active gestures for " + userID + ": " +
+                    response["Message"].AsString());
+            }
+
+            return new OSDArray();
+        }
+
+        private void SaveGestures(UUID userID, OSDArray gestures)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "AddUserData" },
+                { "UserID", userID.ToString() },
+                { "Gestures", OSDParser.SerializeJsonString(gestures) }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_userServerUrl, requestArgs);
+            if (!response["Success"].AsBoolean())
+            {
+                m_log.Warn("[INVENTORY CONNECTOR]: Failed to save active gestures for " + userID + ": " +
+                    response["Message"].AsString());
+            }
+        }
+    }
+}
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
new file mode 100644
index 0000000..1b5edf4
--- /dev/null
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -0,0 +1,511 @@
+/*
+ * 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.Net;
+using System.Reflection;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenSim.Server.Base;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
+using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
+
+namespace OpenSim.Services.Connectors.SimianGrid
+{
+    /// <summary>
+    /// Connects avatar presence information (for tracking current location and
+    /// message routing) to the SimianGrid backend
+    /// </summary>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class SimianPresenceServiceConnector : IPresenceService, ISharedRegionModule
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_serverUrl = String.Empty;
+
+        #region ISharedRegionModule
+
+        public Type ReplaceableInterface { get { return null; } }
+        public void RegionLoaded(Scene scene) { }
+        public void PostInitialise() { }
+        public void Close() { }
+
+        public SimianPresenceServiceConnector() { }
+        public string Name { get { return "SimianPresenceServiceConnector"; } }
+        public void AddRegion(Scene scene)
+        {
+            if (!String.IsNullOrEmpty(m_serverUrl))
+            {
+                scene.RegisterModuleInterface<IPresenceService>(this);
+
+                scene.EventManager.OnMakeRootAgent += MakeRootAgentHandler;
+                scene.EventManager.OnNewClient += NewClientHandler;
+                scene.EventManager.OnSignificantClientMovement += SignificantClientMovementHandler;
+
+                LogoutRegionAgents(scene.RegionInfo.RegionID);
+            }
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            if (!String.IsNullOrEmpty(m_serverUrl))
+            {
+                scene.UnregisterModuleInterface<IPresenceService>(this);
+
+                scene.EventManager.OnMakeRootAgent -= MakeRootAgentHandler;
+                scene.EventManager.OnNewClient -= NewClientHandler;
+                scene.EventManager.OnSignificantClientMovement -= SignificantClientMovementHandler;
+
+                LogoutRegionAgents(scene.RegionInfo.RegionID);
+            }
+        }
+
+        #endregion ISharedRegionModule
+
+        public SimianPresenceServiceConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            if (Simian.IsSimianEnabled(source, "PresenceServices"))
+            {
+                IConfig gridConfig = source.Configs["PresenceService"];
+                if (gridConfig == null)
+                {
+                    m_log.Error("[PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini");
+                    throw new Exception("Presence connector init error");
+                }
+
+                string serviceUrl = gridConfig.GetString("PresenceServerURI");
+                if (String.IsNullOrEmpty(serviceUrl))
+                {
+                    m_log.Error("[PRESENCE CONNECTOR]: No PresenceServerURI in section PresenceService");
+                    throw new Exception("Presence connector init error");
+                }
+
+                m_serverUrl = serviceUrl;
+            }
+        }
+
+        #region IPresenceService
+
+        public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID)
+        {
+            m_log.ErrorFormat("[PRESENCE CONNECTOR]: Login requested, UserID={0}, SessionID={1}, SecureSessionID={2}",
+                userID, sessionID, secureSessionID);
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "AddSession" },
+                { "UserID", userID.ToString() }
+            };
+            if (sessionID != UUID.Zero)
+            {
+                requestArgs["SessionID"] = sessionID.ToString();
+                requestArgs["SecureSessionID"] = secureSessionID.ToString();
+            }
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+                m_log.Warn("[PRESENCE CONNECTOR]: Failed to login agent " + userID + ": " + response["Message"].AsString());
+
+            return success;
+        }
+
+        public bool LogoutAgent(UUID sessionID, Vector3 position, Vector3 lookAt)
+        {
+            m_log.InfoFormat("[PRESENCE CONNECTOR]: Logout requested for agent with sessionID " + sessionID);
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "RemoveSession" },
+                { "SessionID", sessionID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+                m_log.Warn("[PRESENCE CONNECTOR]: Failed to logout agent with sessionID " + sessionID + ": " + response["Message"].AsString());
+
+            return success;
+        }
+
+        public bool LogoutRegionAgents(UUID regionID)
+        {
+            m_log.InfoFormat("[PRESENCE CONNECTOR]: Logout requested for all agents in region " + regionID);
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "RemoveSessions" },
+                { "SceneID", regionID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+                m_log.Warn("[PRESENCE CONNECTOR]: Failed to logout agents from region " + regionID + ": " + response["Message"].AsString());
+
+            return success;
+        }
+
+        public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            //m_log.DebugFormat("[PRESENCE CONNECTOR]: Updating session data for agent with sessionID " + sessionID);
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "UpdateSession" },
+                { "SessionID", sessionID.ToString() },
+                { "SceneID", regionID.ToString() },
+                { "ScenePosition", position.ToString() },
+                { "SceneLookAt", lookAt.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+                m_log.Warn("[PRESENCE CONNECTOR]: Failed to update agent session " + sessionID + ": " + response["Message"].AsString());
+
+            return success;
+        }
+
+        public PresenceInfo GetAgent(UUID sessionID)
+        {
+            m_log.DebugFormat("[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())
+            {
+                UUID userID = sessionResponse["UserID"].AsUUID();
+                m_log.DebugFormat("[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("[PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + userResponse["Message"].AsString());
+            }
+            else
+            {
+                m_log.Warn("[PRESENCE CONNECTOR]: Failed to retrieve session " + sessionID + ": " + sessionResponse["Message"].AsString());
+            }
+
+            return null;
+        }
+
+        public PresenceInfo[] GetAgents(string[] userIDs)
+        {
+            List<PresenceInfo> presences = new List<PresenceInfo>(userIDs.Length);
+
+            for (int i = 0; i < userIDs.Length; i++)
+            {
+                UUID userID;
+                if (UUID.TryParse(userIDs[i], out userID) && userID != UUID.Zero)
+                    presences.AddRange(GetSessions(userID));
+            }
+
+            return presences.ToArray();
+        }
+
+        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            m_log.DebugFormat("[PRESENCE CONNECTOR]: Setting home location for user  " + userID);
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "AddUserData" },
+                { "UserID", userID.ToString() },
+                { "HomeLocation", SerializeLocation(regionID, position, lookAt) }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+                m_log.Warn("[PRESENCE CONNECTOR]: Failed to set home location for " + userID + ": " + response["Message"].AsString());
+
+            return success;
+        }
+
+        #endregion IPresenceService
+
+        #region Presence Detection
+
+        private void MakeRootAgentHandler(ScenePresence sp)
+        {
+            m_log.DebugFormat("[PRESENCE DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName);
+
+            ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
+            SetLastLocation(sp.UUID, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
+        }
+
+        private void NewClientHandler(IClientAPI client)
+        {
+            client.OnConnectionClosed += LogoutHandler;
+        }
+
+        private void SignificantClientMovementHandler(IClientAPI client)
+        {
+            ScenePresence sp;
+            if (client.Scene is Scene && ((Scene)client.Scene).TryGetAvatar(client.AgentId, out sp))
+                ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
+        }
+
+        private void LogoutHandler(IClientAPI client)
+        {
+            if (client.IsLoggingOut)
+            {
+                client.OnConnectionClosed -= LogoutHandler;
+
+                object obj;
+                if (client.Scene.TryGetAvatar(client.AgentId, out obj) && obj is ScenePresence)
+                {
+                    // The avatar is still in the scene, we can get the exact logout position
+                    ScenePresence sp = (ScenePresence)obj;
+                    SetLastLocation(client.AgentId, client.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
+                }
+                else
+                {
+                    // The avatar was already removed from the scene, store LastLocation using the most recent session data
+                    m_log.Warn("[PRESENCE]: " + client.Name + " has already been removed from the scene, storing approximate LastLocation");
+                    SetLastLocation(client.SessionId);
+                }
+
+                LogoutAgent(client.SessionId, Vector3.Zero, Vector3.UnitX);
+            }
+        }
+
+        #endregion Presence Detection
+
+        #region Helpers
+
+        private OSDMap GetUserData(UUID userID)
+        {
+            m_log.DebugFormat("[PRESENCE CONNECTOR]: Requesting user data for " + userID);
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "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("[PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + response["Message"].AsString());
+
+            return null;
+        }
+
+        private OSDMap GetSessionData(UUID sessionID)
+        {
+            m_log.DebugFormat("[PRESENCE CONNECTOR]: Requesting session data for session " + sessionID);
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetSession" },
+                { "SessionID", sessionID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+                return response;
+            else
+                m_log.Warn("[PRESENCE CONNECTOR]: Failed to retrieve session data for session " + sessionID);
+
+            return null;
+        }
+
+        private List<PresenceInfo> GetSessions(UUID userID)
+        {
+            List<PresenceInfo> presences = new List<PresenceInfo>(1);
+
+            OSDMap userResponse = GetUserData(userID);
+            if (userResponse != null)
+            {
+                m_log.DebugFormat("[PRESENCE CONNECTOR]: Requesting sessions for " + userID);
+
+                NameValueCollection requestArgs = new NameValueCollection
+                {
+                    { "RequestMethod", "GetSession" },
+                    { "UserID", userID.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.Warn("[PRESENCE CONNECTOR]: Failed to retrieve sessions for " + userID + ": " + response["Message"].AsString());
+                }
+            }
+
+            return presences;
+        }
+
+        /// <summary>
+        /// Fetch the last known avatar location with GetSession and persist it
+        /// as user data with AddUserData
+        /// </summary>
+        private bool SetLastLocation(UUID sessionID)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetSession" },
+                { "SessionID", sessionID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (success)
+            {
+                UUID userID = response["UserID"].AsUUID();
+                UUID sceneID = response["SceneID"].AsUUID();
+                Vector3 position = response["ScenePosition"].AsVector3();
+                Vector3 lookAt = response["SceneLookAt"].AsVector3();
+
+                return SetLastLocation(userID, sceneID, position, lookAt);
+            }
+            else
+            {
+                m_log.Warn("[PRESENCE CONNECTOR]: Failed to retrieve presence information for session " + sessionID +
+                    " while saving last location: " + response["Message"].AsString());
+            }
+
+            return success;
+        }
+
+        private bool SetLastLocation(UUID userID, UUID sceneID, Vector3 position, Vector3 lookAt)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+                {
+                    { "RequestMethod", "AddUserData" },
+                    { "UserID", userID.ToString() },
+                    { "LastLocation", SerializeLocation(sceneID, position, lookAt) }
+                };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+                m_log.Warn("[PRESENCE CONNECTOR]: Failed to set last location for " + userID + ": " + response["Message"].AsString());
+
+            return success;
+        }
+
+        private PresenceInfo ResponseToPresenceInfo(OSDMap sessionResponse, OSDMap userResponse)
+        {
+            if (sessionResponse == null)
+                return null;
+
+            PresenceInfo info = new PresenceInfo();
+
+            info.Online = true;
+            info.UserID = sessionResponse["UserID"].AsUUID().ToString();
+            info.RegionID = sessionResponse["SceneID"].AsUUID();
+            info.Position = sessionResponse["ScenePosition"].AsVector3();
+            info.LookAt = sessionResponse["SceneLookAt"].AsVector3();
+
+            if (userResponse != null && userResponse["User"] is OSDMap)
+            {
+                OSDMap user = (OSDMap)userResponse["User"];
+
+                info.Login = user["LastLoginDate"].AsDate();
+                info.Logout = user["LastLogoutDate"].AsDate();
+                DeserializeLocation(user["HomeLocation"].AsString(), out info.HomeRegionID, out info.HomePosition, out info.HomeLookAt);
+            }
+
+            return info;
+        }
+
+        private string SerializeLocation(UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            return "{" + String.Format("\"SceneID\":\"{0}\",\"Position\":\"{1}\",\"LookAt\":\"{2}\"", regionID, position, lookAt) + "}";
+        }
+
+        private bool DeserializeLocation(string location, out UUID regionID, out Vector3 position, out Vector3 lookAt)
+        {
+            OSDMap map = null;
+
+            try { map = OSDParser.DeserializeJson(location) as OSDMap; }
+            catch { }
+
+            if (map != null)
+            {
+                regionID = map["SceneID"].AsUUID();
+                if (Vector3.TryParse(map["Position"].AsString(), out position) &&
+                    Vector3.TryParse(map["LookAt"].AsString(), out lookAt))
+                {
+                    return true;
+                }
+            }
+
+            regionID = UUID.Zero;
+            position = Vector3.Zero;
+            lookAt = Vector3.Zero;
+            return false;
+        }
+
+        #endregion Helpers
+    }
+}
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
new file mode 100644
index 0000000..9c226fb
--- /dev/null
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
@@ -0,0 +1,435 @@
+/*
+ * 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.Reflection;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Framework.Client;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+
+namespace OpenSim.Services.Connectors.SimianGrid
+{
+    /// <summary>
+    /// Avatar profile flags
+    /// </summary>
+    [Flags]
+    public enum ProfileFlags : uint
+    {
+        AllowPublish = 1,
+        MaturePublish = 2,
+        Identified = 4,
+        Transacted = 8,
+        Online = 16
+    }
+
+    /// <summary>
+    /// Connects avatar profile and classified queries to the SimianGrid
+    /// backend
+    /// </summary>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class SimianProfiles : INonSharedRegionModule
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_serverUrl = String.Empty;
+
+        #region INonSharedRegionModule
+        
+        public Type ReplaceableInterface { get { return null; } }
+        public void RegionLoaded(Scene scene) { }
+        public void Close() { }
+
+        public SimianProfiles() { }
+        public string Name { get { return "SimianProfiles"; } }
+        public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { CheckEstateManager(scene); scene.EventManager.OnClientConnect += ClientConnectHandler; } }
+        public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.EventManager.OnClientConnect -= ClientConnectHandler; } }
+
+        #endregion INonSharedRegionModule
+
+        public SimianProfiles(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            if (Simian.IsSimianEnabled(source, "UserAccountServices"))
+            {
+                IConfig gridConfig = source.Configs["UserAccountService"];
+                if (gridConfig == null)
+                {
+                    m_log.Error("[PROFILES]: UserAccountService missing from OpenSim.ini");
+                    throw new Exception("Profiles init error");
+                }
+
+                string serviceUrl = gridConfig.GetString("UserAccountServerURI");
+                if (String.IsNullOrEmpty(serviceUrl))
+                {
+                    m_log.Error("[PROFILES]: No UserAccountServerURI in section UserAccountService");
+                    throw new Exception("Profiles init error");
+                }
+
+                if (!serviceUrl.EndsWith("/"))
+                    serviceUrl = serviceUrl + '/';
+
+                m_serverUrl = serviceUrl;
+            }
+        }
+
+        private void ClientConnectHandler(IClientCore clientCore)
+        {
+            if (clientCore is IClientAPI)
+            {
+                IClientAPI client = (IClientAPI)clientCore;
+
+                // Classifieds
+                client.AddGenericPacketHandler("avatarclassifiedsrequest", AvatarClassifiedsRequestHandler);
+                client.OnClassifiedInfoRequest += ClassifiedInfoRequestHandler;
+                client.OnClassifiedInfoUpdate += ClassifiedInfoUpdateHandler;
+                client.OnClassifiedDelete += ClassifiedDeleteHandler;
+
+                // Picks
+                client.AddGenericPacketHandler("avatarpicksrequest", HandleAvatarPicksRequest);
+                client.AddGenericPacketHandler("pickinforequest", HandlePickInfoRequest);
+                client.OnPickInfoUpdate += PickInfoUpdateHandler;
+                client.OnPickDelete += PickDeleteHandler;
+
+                // Notes
+                client.AddGenericPacketHandler("avatarnotesrequest", HandleAvatarNotesRequest);
+                client.OnAvatarNotesUpdate += AvatarNotesUpdateHandler;
+
+                // Profiles
+                client.OnRequestAvatarProperties += RequestAvatarPropertiesHandler;
+                client.OnUpdateAvatarProperties += UpdateAvatarPropertiesHandler;
+                client.OnAvatarInterestUpdate += AvatarInterestUpdateHandler;
+                client.OnUserInfoRequest += UserInfoRequestHandler;
+                client.OnUpdateUserInfo += UpdateUserInfoHandler;
+            }
+        }
+
+        #region Classifieds
+
+        private void AvatarClassifiedsRequestHandler(Object sender, string method, List<String> args)
+        {
+            if (!(sender is IClientAPI))
+                return;
+            IClientAPI client = (IClientAPI)sender;
+
+            UUID targetAvatarID;
+            if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID))
+            {
+                m_log.Error("[PROFILES]: Unrecognized arguments for " + method);
+                return;
+            }
+
+            // FIXME: Query the generic key/value store for classifieds
+            client.SendAvatarClassifiedReply(targetAvatarID, new Dictionary<UUID, string>(0));
+        }
+
+        private void ClassifiedInfoRequestHandler(UUID classifiedID, IClientAPI client)
+        {
+            // FIXME: Fetch this info
+            client.SendClassifiedInfoReply(classifiedID, UUID.Zero, 0, Utils.DateTimeToUnixTime(DateTime.UtcNow + TimeSpan.FromDays(1)),
+                0, String.Empty, String.Empty, UUID.Zero, 0, UUID.Zero, String.Empty, Vector3.Zero, String.Empty, 0, 0);
+        }
+
+        private void ClassifiedInfoUpdateHandler(UUID classifiedID, uint category, string name, string description,
+            UUID parcelID, uint parentEstate, UUID snapshotID, Vector3 globalPos, byte classifiedFlags, int price,
+            IClientAPI client)
+        {
+            // FIXME: Save this info
+        }
+
+        private void ClassifiedDeleteHandler(UUID classifiedID, IClientAPI client)
+        {
+            // FIXME: Delete the specified classified ad
+        }
+
+        #endregion Classifieds
+
+        #region Picks
+
+        private void HandleAvatarPicksRequest(Object sender, string method, List<String> args)
+        {
+            if (!(sender is IClientAPI))
+                return;
+            IClientAPI client = (IClientAPI)sender;
+
+            UUID targetAvatarID;
+            if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID))
+            {
+                m_log.Error("[PROFILES]: Unrecognized arguments for " + method);
+                return;
+            }
+
+            // FIXME: Fetch these
+            client.SendAvatarPicksReply(targetAvatarID, new Dictionary<UUID, string>(0));
+        }
+
+        private void HandlePickInfoRequest(Object sender, string method, List<String> args)
+        {
+            if (!(sender is IClientAPI))
+                return;
+            IClientAPI client = (IClientAPI)sender;
+
+            UUID avatarID;
+            UUID pickID;
+            if (args.Count < 2 || !UUID.TryParse(args[0], out avatarID) || !UUID.TryParse(args[1], out pickID))
+            {
+                m_log.Error("[PROFILES]: Unrecognized arguments for " + method);
+                return;
+            }
+
+            // FIXME: Fetch this
+            client.SendPickInfoReply(pickID, avatarID, false, UUID.Zero, String.Empty, String.Empty, UUID.Zero, String.Empty,
+                String.Empty, String.Empty, Vector3.Zero, 0, false);
+        }
+
+        private void PickInfoUpdateHandler(IClientAPI client, UUID pickID, UUID creatorID, bool topPick, string name,
+            string desc, UUID snapshotID, int sortOrder, bool enabled)
+        {
+            // FIXME: Save this
+        }
+
+        private void PickDeleteHandler(IClientAPI client, UUID pickID)
+        {
+            // FIXME: Delete
+        }
+
+        #endregion Picks
+
+        #region Notes
+
+        private void HandleAvatarNotesRequest(Object sender, string method, List<String> args)
+        {
+            if (!(sender is IClientAPI))
+                return;
+            IClientAPI client = (IClientAPI)sender;
+
+            UUID targetAvatarID;
+            if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID))
+            {
+                m_log.Error("[PROFILES]: Unrecognized arguments for " + method);
+                return;
+            }
+
+            // FIXME: Fetch this
+            client.SendAvatarNotesReply(targetAvatarID, String.Empty);
+        }
+
+        private void AvatarNotesUpdateHandler(IClientAPI client, UUID targetID, string notes)
+        {
+            // FIXME: Save this
+        }
+
+        #endregion Notes
+
+        #region Profiles
+
+        private void RequestAvatarPropertiesHandler(IClientAPI client, UUID avatarID)
+        {
+            OSDMap user = FetchUserData(avatarID);
+
+            ProfileFlags flags = ProfileFlags.AllowPublish | ProfileFlags.MaturePublish;
+
+            if (user != null)
+            {
+                OSDMap about = null;
+                if (user.ContainsKey("LLAbout"))
+                {
+                    try { about = OSDParser.DeserializeJson(user["LLAbout"].AsString()) as OSDMap; }
+                    catch { }
+                }
+
+                if (about == null)
+                    about = new OSDMap(0);
+
+                // Check if this user is a grid operator
+                byte[] charterMember;
+                if (user["AccessLevel"].AsInteger() >= 200)
+                    charterMember = Utils.StringToBytes("Operator");
+                else
+                    charterMember = Utils.EmptyBytes;
+
+                // Check if the user is online
+                if (client.Scene is Scene)
+                {
+                    OpenSim.Services.Interfaces.PresenceInfo[] presences = ((Scene)client.Scene).PresenceService.GetAgents(new string[] { avatarID.ToString() });
+                    if (presences != null && presences.Length > 0)
+                        flags |= ProfileFlags.Online;
+                }
+
+                // Check if the user is identified
+                if (user["Identified"].AsBoolean())
+                    flags |= ProfileFlags.Identified;
+
+                client.SendAvatarProperties(avatarID, about["About"].AsString(), user["CreationDate"].AsDate().ToString("M/d/yyyy",
+                    System.Globalization.CultureInfo.InvariantCulture), charterMember, about["FLAbout"].AsString(), (uint)flags,
+                    about["FLImage"].AsUUID(), about["Image"].AsUUID(), about["URL"].AsString(), user["Partner"].AsUUID());
+
+            }
+            else
+            {
+                m_log.Warn("[PROFILES]: Failed to fetch profile information for " + client.Name + ", returning default values");
+                client.SendAvatarProperties(avatarID, String.Empty, "1/1/1970", Utils.EmptyBytes,
+                    String.Empty, (uint)flags, UUID.Zero, UUID.Zero, String.Empty, UUID.Zero);
+            }
+        }
+
+        private void UpdateAvatarPropertiesHandler(IClientAPI client, UserProfileData profileData)
+        {
+            OSDMap map = new OSDMap
+            {
+                { "About", OSD.FromString(profileData.AboutText) },
+                { "Image", OSD.FromUUID(profileData.Image) },
+                { "FLAbout", OSD.FromString(profileData.FirstLifeAboutText) },
+                { "FLImage", OSD.FromUUID(profileData.FirstLifeImage) },
+                { "URL", OSD.FromString(profileData.ProfileUrl) }
+            };
+
+            AddUserData(client.AgentId, "LLAbout", map);
+        }
+
+        private void AvatarInterestUpdateHandler(IClientAPI client, uint wantmask, string wanttext, uint skillsmask,
+            string skillstext, string languages)
+        {
+            OSDMap map = new OSDMap
+            {
+                { "WantMask", OSD.FromInteger(wantmask) },
+                { "WantText", OSD.FromString(wanttext) },
+                { "SkillsMask", OSD.FromInteger(skillsmask) },
+                { "SkillsText", OSD.FromString(skillstext) },
+                { "Languages", OSD.FromString(languages) }
+            };
+
+            AddUserData(client.AgentId, "LLInterests", map);
+        }
+
+        private void UserInfoRequestHandler(IClientAPI client)
+        {
+            m_log.Error("[PROFILES]: UserInfoRequestHandler");
+
+            // Fetch this user's e-mail address
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetUser" },
+                { "UserID", client.AgentId.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            string email = response["Email"].AsString();
+
+            if (!response["Success"].AsBoolean())
+                m_log.Warn("[PROFILES]: GetUser failed during a user info request for " + client.Name);
+
+            client.SendUserInfoReply(false, true, email);
+        }
+
+        private void UpdateUserInfoHandler(bool imViaEmail, bool visible, IClientAPI client)
+        {
+            m_log.Info("[PROFILES]: Ignoring user info update from " + client.Name);
+        }
+
+        #endregion Profiles
+
+        /// <summary>
+        /// Sanity checks regions for a valid estate owner at startup
+        /// </summary>
+        private void CheckEstateManager(Scene scene)
+        {
+            EstateSettings estate = scene.RegionInfo.EstateSettings;
+
+            if (estate.EstateOwner == UUID.Zero)
+            {
+                // Attempt to lookup the grid admin
+                UserAccount admin = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, UUID.Zero);
+                if (admin != null)
+                {
+                    m_log.InfoFormat("[PROFILES]: Setting estate {0} (ID: {1}) owner to {2}", estate.EstateName,
+                        estate.EstateID, admin.Name);
+
+                    estate.EstateOwner = admin.PrincipalID;
+                    estate.Save();
+                }
+                else
+                {
+                    m_log.WarnFormat("[PROFILES]: Estate {0} (ID: {1}) does not have an owner", estate.EstateName, estate.EstateID);
+                }
+            }
+        }
+
+        private bool AddUserData(UUID userID, string key, OSDMap value)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "AddUserData" },
+                { "UserID", userID.ToString() },
+                { key, OSDParser.SerializeJsonString(value) }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+                m_log.WarnFormat("[PROFILES]: Failed to add user data with key {0} for {1}: {2}", key, userID, response["Message"].AsString());
+
+            return success;
+        }
+
+        private OSDMap FetchUserData(UUID userID)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetUser" },
+                { "UserID", userID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean() && response["User"] is OSDMap)
+            {
+                return (OSDMap)response["User"];
+            }
+            else
+            {
+                m_log.Error("[PROFILES]: Failed to fetch user data for " + userID + ": " + response["Message"].AsString());
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
new file mode 100644
index 0000000..bb0ac57
--- /dev/null
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -0,0 +1,311 @@
+/*
+ * 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 OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
+namespace OpenSim.Services.Connectors.SimianGrid
+{
+    /// <summary>
+    /// Connects user account data (creating new users, looking up existing 
+    /// users) to the SimianGrid backend
+    /// </summary>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class SimianUserAccountServiceConnector : IUserAccountService, ISharedRegionModule
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_serverUrl = String.Empty;
+        private ExpiringCache<UUID, UserAccount> m_accountCache;
+
+        #region ISharedRegionModule
+
+        public Type ReplaceableInterface { get { return null; } }
+        public void RegionLoaded(Scene scene) { }
+        public void PostInitialise() { }
+        public void Close() { }
+
+        public SimianUserAccountServiceConnector() { }
+        public string Name { get { return "SimianUserAccountServiceConnector"; } }
+        public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.RegisterModuleInterface<IUserAccountService>(this); } }
+        public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.UnregisterModuleInterface<IUserAccountService>(this); } }
+
+        #endregion ISharedRegionModule
+
+        public SimianUserAccountServiceConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            if (Simian.IsSimianEnabled(source, "UserAccountServices"))
+            {
+                IConfig assetConfig = source.Configs["UserAccountService"];
+                if (assetConfig == null)
+                {
+                    m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini");
+                    throw new Exception("User account connector init error");
+                }
+
+                string serviceURI = assetConfig.GetString("UserAccountServerURI");
+                if (String.IsNullOrEmpty(serviceURI))
+                {
+                    m_log.Error("[ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService, skipping SimianUserAccountServiceConnector");
+                    throw new Exception("User account connector init error");
+                }
+
+                m_accountCache = new ExpiringCache<UUID, UserAccount>();
+                m_serverUrl = serviceURI;
+            }
+        }
+
+        public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetUser" },
+                { "Name", firstName + ' ' + lastName }
+            };
+
+            return GetUser(requestArgs);
+        }
+
+        public UserAccount GetUserAccount(UUID scopeID, string email)
+        {
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetUser" },
+                { "Email", email }
+            };
+
+            return GetUser(requestArgs);
+        }
+
+        public UserAccount GetUserAccount(UUID scopeID, UUID userID)
+        {
+            // Cache check
+            UserAccount account;
+            if (m_accountCache.TryGetValue(userID, out account))
+                return account;
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetUser" },
+                { "UserID", userID.ToString() }
+            };
+
+            return GetUser(requestArgs);
+        }
+
+        public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
+        {
+            List<UserAccount> accounts = new List<UserAccount>();
+
+            m_log.DebugFormat("[ACCOUNT CONNECTOR]: Searching for user accounts with name query " + query);
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetUsers" },
+                { "NameQuery", query }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+            {
+                OSDArray array = response["Users"] as OSDArray;
+                if (array != null && array.Count > 0)
+                {
+                    for (int i = 0; i < array.Count; i++)
+                    {
+                        UserAccount account = ResponseToUserAccount(array[i] as OSDMap);
+                        if (account != null)
+                            accounts.Add(account);
+                    }
+                }
+                else
+                {
+                    m_log.Warn("[ACCOUNT CONNECTOR]: Account search failed, response data was in an invalid format");
+                }
+            }
+            else
+            {
+                m_log.Warn("[ACCOUNT CONNECTOR]: Failed to search for account data by name " + query);
+            }
+
+            return accounts;
+        }
+
+        public bool StoreUserAccount(UserAccount data)
+        {
+            m_log.InfoFormat("[ACCOUNT CONNECTOR]: Storing user account for " + data.Name);
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "AddUser" },
+                { "UserID", data.PrincipalID.ToString() },
+                { "Name", data.Name },
+                { "Email", data.Email },
+                { "AccessLevel", data.UserLevel.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            
+            if (response["Success"].AsBoolean())
+            {
+                m_log.InfoFormat("[ACCOUNT CONNECTOR]: Storing user account data for " + data.Name);
+
+                requestArgs = new NameValueCollection
+                {
+                    { "RequestMethod", "AddUserData" },
+                    { "UserID", data.PrincipalID.ToString() },
+                    { "CreationDate", data.Created.ToString() },
+                    { "UserFlags", data.UserFlags.ToString() },
+                    { "UserTitle", data.UserTitle }
+                };
+
+                response = WebUtil.PostToService(m_serverUrl, requestArgs);
+                bool success = response["Success"].AsBoolean();
+
+                if (success)
+                {
+                    // Cache the user account info
+                    m_accountCache.AddOrUpdate(data.PrincipalID, data, DateTime.Now + TimeSpan.FromMinutes(2.0d));
+                }
+                else
+                {
+                    m_log.Warn("[ACCOUNT CONNECTOR]: Failed to store user account data for " + data.Name + ": " + response["Message"].AsString());
+                }
+
+                return success;
+            }
+            else
+            {
+                m_log.Warn("[ACCOUNT CONNECTOR]: Failed to store user account for " + data.Name + ": " + response["Message"].AsString());
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Helper method for the various ways of retrieving a user account
+        /// </summary>
+        /// <param name="requestArgs">Service query parameters</param>
+        /// <returns>A UserAccount object on success, null on failure</returns>
+        private UserAccount GetUser(NameValueCollection requestArgs)
+        {
+            string lookupValue = (requestArgs.Count > 1) ? requestArgs[1] : "(Unknown)";
+            m_log.DebugFormat("[ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue);
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+            {
+                OSDMap user = response["User"] as OSDMap;
+                if (user != null)
+                    return ResponseToUserAccount(user);
+                else
+                    m_log.Warn("[ACCOUNT CONNECTOR]: Account search failed, response data was in an invalid format");
+            }
+            else
+            {
+                m_log.Warn("[ACCOUNT CONNECTOR]: Failed to lookup user account with query: " + lookupValue);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Convert a User object in LLSD format to a UserAccount
+        /// </summary>
+        /// <param name="response">LLSD containing user account data</param>
+        /// <returns>A UserAccount object on success, null on failure</returns>
+        private UserAccount ResponseToUserAccount(OSDMap response)
+        {
+            if (response == null)
+                return null;
+
+            UserAccount account = new UserAccount();
+            account.PrincipalID = response["UserID"].AsUUID();
+            account.Created = response["CreationDate"].AsInteger();
+            account.Email = response["Email"].AsString();
+            account.ServiceURLs = new Dictionary<string, object>(0);
+            account.UserFlags = response["UserFlags"].AsInteger();
+            account.UserLevel = response["AccessLevel"].AsInteger();
+            account.UserTitle = response["UserTitle"].AsString();
+            GetFirstLastName(response["Name"].AsString(), out account.FirstName, out account.LastName);
+
+            // Cache the user account info
+            m_accountCache.AddOrUpdate(account.PrincipalID, account, DateTime.Now + TimeSpan.FromMinutes(2.0d));
+
+            return account;
+        }
+
+        /// <summary>
+        /// Convert a name with a single space in it to a first and last name
+        /// </summary>
+        /// <param name="name">A full name such as "John Doe"</param>
+        /// <param name="firstName">First name</param>
+        /// <param name="lastName">Last name (surname)</param>
+        private static void GetFirstLastName(string name, out string firstName, out string lastName)
+        {
+            if (String.IsNullOrEmpty(name))
+            {
+                firstName = String.Empty;
+                lastName = String.Empty;
+            }
+            else
+            {
+                string[] names = name.Split(' ');
+
+                if (names.Length == 2)
+                {
+                    firstName = names[0];
+                    lastName = names[1];
+                }
+                else
+                {
+                    firstName = String.Empty;
+                    lastName = name;
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
index 8e7c92b..2f9b520 100644
--- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
@@ -113,6 +113,7 @@ namespace OpenSim.Services.Connectors
 
         public virtual UserAccount GetUserAccount(UUID scopeID, UUID userID)
         {
+            m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUSerAccount {0}", userID);
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             //sendData["SCOPEID"] = scopeID.ToString();
             sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 1368e46..2faf018 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -123,8 +123,7 @@ namespace OpenSim.Services.GridService
                 if ((rflags & OpenSim.Data.RegionFlags.Reservation) != 0)
                 {
                     // Regions reserved for the null key cannot be taken.
-                    //
-                    if (region.Data["PrincipalID"] == UUID.Zero.ToString())
+                    if ((string)region.Data["PrincipalID"] == UUID.Zero.ToString())
                         return "Region location us reserved";
 
                     // Treat it as an auth request
@@ -132,7 +131,6 @@ namespace OpenSim.Services.GridService
                     // NOTE: Fudging the flags value here, so these flags
                     //       should not be used elsewhere. Don't optimize
                     //       this with the later retrieval of the same flags!
-                    //
                     rflags |= OpenSim.Data.RegionFlags.Authenticate;
                 }
 
@@ -489,7 +487,7 @@ namespace OpenSim.Services.GridService
                         f |= (OpenSim.Data.RegionFlags)val;
                     }
                 }
-                catch (Exception e)
+                catch (Exception)
                 {
                     MainConsole.Instance.Output("Error in flag specification: " + p);
                 }
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index de5df9d..58746d0 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -168,10 +168,11 @@ namespace OpenSim.Services.GridService
             }
 
             // Sanity check. 
-            IPAddress ipaddr = null;
+            //IPAddress ipaddr = null;
             try
             {
-                ipaddr = Util.GetHostFromDNS(host);
+                //ipaddr = Util.GetHostFromDNS(host);
+                Util.GetHostFromDNS(host);
             }
             catch 
             {
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 15379b5..26f211b 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.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.Net;
 using System.Reflection;
diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
index 3dacf53..a45bf8c 100644
--- a/OpenSim/Services/Interfaces/IUserAccountService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -140,14 +140,20 @@ namespace OpenSim.Services.Interfaces
         UserAccount GetUserAccount(UUID scopeID, UUID userID);
         UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName);
         UserAccount GetUserAccount(UUID scopeID, string Email);
-        // Returns the list of avatars that matches both the search
-        // criterion and the scope ID passed
-        //
+
+        /// <summary>
+        /// Returns the list of avatars that matches both the search criterion and the scope ID passed
+        /// </summary>
+        /// <param name="scopeID"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
         List<UserAccount> GetUserAccounts(UUID scopeID, string query);
 
-        // Store the data given, wich replaces the sotred data, therefore
-        // must be complete.
-        //
+        /// <summary>
+        /// Store the data given, wich replaces the sotred data, therefore must be complete.
+        /// </summary>
+        /// <param name="data"></param>
+        /// <returns></returns>
         bool StoreUserAccount(UserAccount data);
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 05f5b4c..ee30fa3 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -47,9 +47,9 @@ namespace OpenSim.Services.LLLoginService
 {
     public class LLFailedLoginResponse : OpenSim.Services.Interfaces.FailedLoginResponse
     {
-        string m_key;
-        string m_value;
-        string m_login;
+        protected string m_key;
+        protected string m_value;
+        protected string m_login;
 
         public static LLFailedLoginResponse UserProblem;
         public static LLFailedLoginResponse AuthorizationProblem;
@@ -623,7 +623,7 @@ namespace OpenSim.Services.LLLoginService
         }
 
         private InventoryData GetInventorySkeleton(List<InventoryFolderBase> folders)
-        {            
+        {
             UUID rootID = UUID.Zero;
             ArrayList AgentInventoryArray = new ArrayList();
             Hashtable TempHash;
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index ae729f8..1eaf4d4 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.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.Net;
 using System.Reflection;
@@ -24,24 +51,24 @@ namespace OpenSim.Services.LLLoginService
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool Initialized = false;
 
-        private IUserAccountService m_UserAccountService;
-        private IAuthenticationService m_AuthenticationService;
-        private IInventoryService m_InventoryService;
-        private IGridService m_GridService;
-        private IPresenceService m_PresenceService;
+        protected IUserAccountService m_UserAccountService;
+        protected IAuthenticationService m_AuthenticationService;
+        protected IInventoryService m_InventoryService;
+        protected IGridService m_GridService;
+        protected IPresenceService m_PresenceService;
         private ISimulationService m_LocalSimulationService;
         private ISimulationService m_RemoteSimulationService;
-        private ILibraryService m_LibraryService;
-        private IFriendsService m_FriendsService;
-        private IAvatarService m_AvatarService;
+        protected ILibraryService m_LibraryService;
+        protected IFriendsService m_FriendsService;
+        protected IAvatarService m_AvatarService;
         private IUserAgentService m_UserAgentService;
 
         private GatekeeperServiceConnector m_GatekeeperConnector;
 
         private string m_DefaultRegionName;
-        private string m_WelcomeMessage;
+        protected string m_WelcomeMessage;
         private bool m_RequireInventory;
-        private int m_MinLoginLevel;
+        protected int m_MinLoginLevel;
         private string m_GatekeeperURL;
 
         IConfig m_LoginServerConfig;
@@ -259,7 +286,7 @@ namespace OpenSim.Services.LLLoginService
             }
         }
 
-        private GridRegion FindDestination(UserAccount account, PresenceInfo pinfo, UUID sessionID, string startLocation, out GridRegion gatekeeper, out string where, out Vector3 position, out Vector3 lookAt)
+        protected GridRegion FindDestination(UserAccount account, PresenceInfo pinfo, UUID sessionID, string startLocation, out GridRegion gatekeeper, out string where, out Vector3 position, out Vector3 lookAt)
         {
             m_log.DebugFormat("[LLOGIN SERVICE]: FindDestination for start location {0}", startLocation);
 
@@ -470,7 +497,7 @@ namespace OpenSim.Services.LLLoginService
             }
         }
 
-        private AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarData avatar,
+        protected AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarData avatar,
             UUID session, UUID secureSession, Vector3 position, string currentWhere, out string where, out string reason)
         {
             where = currentWhere;
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index 304538a..ea8d673 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -72,6 +72,10 @@ namespace OpenSim.Services.PresenceService
                 data.Data["HomeRegionID"] = d[0].Data["HomeRegionID"];
                 data.Data["HomePosition"] = d[0].Data["HomePosition"];
                 data.Data["HomeLookAt"] = d[0].Data["HomeLookAt"];
+                data.Data["Position"] = d[0].Data["Position"];
+                data.Data["LookAt"] = d[0].Data["LookAt"];
+
+                data.RegionID = d[0].RegionID;
             }
             else
             {
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index 36cce75..c6e33bb 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Services.UserAccountService
             info.HomePosition = Vector3.Parse(d.Data["HomePosition"]);
             info.HomeLookAt = Vector3.Parse(d.Data["HomeLookAt"]);
 
-            return info;            
+            return info;
         }
         
         public bool StoreGridUserInfo(GridUserInfo info)
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 82c34e7..38caf74 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -200,7 +200,9 @@ namespace OpenSim.Services.UserAccountService
             }
 
             if (d.Length < 1)
+            {
                 return null;
+            }
 
             return MakeUserAccount(d[0]);
         }
diff --git a/OpenSim/Tests/Common/Mock/MockUserAccountService.cs b/OpenSim/Tests/Common/Mock/MockUserAccountService.cs
new file mode 100644
index 0000000..0769c7a
--- /dev/null
+++ b/OpenSim/Tests/Common/Mock/MockUserAccountService.cs
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Collections.Generic;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Services.Interfaces;
+
+namespace OpenSim.Tests.Common.Mock
+{        
+    public class MockUserAccountService : IUserAccountService
+    {        
+
+        public MockUserAccountService(IConfigSource config) {}
+        
+        public UserAccount GetUserAccount(UUID scopeID, UUID userID) { return new UserAccount(); }
+        public UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName) { return new UserAccount(); }           
+        public UserAccount GetUserAccount(UUID scopeID, string Email) { return new UserAccount(); }
+        public List<UserAccount> GetUserAccounts(UUID scopeID, string query) { return new List<UserAccount>(); }
+        public bool StoreUserAccount(UserAccount data) { return true; }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 076cb7a..01f2c14 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -65,6 +65,6 @@ namespace OpenSim.Tests.Common.Mock
         public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter
         {
             get { return m_asyncSceneObjectDeleter; }
-        }
+        }      
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 9e718f6..864e2aa 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -128,7 +128,7 @@ namespace OpenSim.Tests.Common.Setup
         /// <param name="realServices">Starts real inventory and asset services, as opposed to mock ones, if true</param>
         /// <returns></returns>
         public static TestScene SetupScene(
-            string name, UUID id, uint x, uint y,  String realServices)
+            string name, UUID id, uint x, uint y, String realServices)
         {
             bool newScene = false;
 
@@ -179,15 +179,16 @@ namespace OpenSim.Tests.Common.Setup
                     StartAssetService(testScene, true);
                 else
                     StartAssetService(testScene, false);
+                
                 if (realServices.Contains("inventory"))
                     StartInventoryService(testScene, true);
                 else
                     StartInventoryService(testScene, false);
+                
                 if (realServices.Contains("grid"))
                     StartGridService(testScene, true);
-                if (realServices.Contains("useraccounts"))
-                    StartUserAccountService(testScene, true);
-
+                
+                StartUserAccountService(testScene, realServices.Contains("useraccounts"));
             }
             // If not, make sure the shared module gets references to this new scene
             else
@@ -196,9 +197,13 @@ namespace OpenSim.Tests.Common.Setup
                 m_assetService.RegionLoaded(testScene);
                 m_inventoryService.AddRegion(testScene);
                 m_inventoryService.RegionLoaded(testScene);
+                m_userAccountService.AddRegion(testScene);
+                m_userAccountService.RegionLoaded(testScene);
             }
+            
             m_inventoryService.PostInitialise();
             m_assetService.PostInitialise();
+            m_userAccountService.PostInitialise();
 
             testScene.SetModuleInterfaces();
 
@@ -209,6 +214,14 @@ namespace OpenSim.Tests.Common.Setup
             physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
             testScene.PhysicsScene
                 = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher",   new IniConfigSource(), "test");
+
+            // It's really not a good idea to use static variables as they carry over between tests, leading to
+            // problems that are extremely hard to debug.  Really, these static fields need to be eliminated -
+            // tests using multiple regions that need to share modules need to find another solution.
+            m_assetService = null;
+            m_inventoryService = null;
+            m_gridService = null;
+            m_userAccountService = null;
             
             return testScene;
         }
@@ -273,6 +286,11 @@ namespace OpenSim.Tests.Common.Setup
             //testScene.AddRegionModule(m_gridService.Name, m_gridService);
         }
 
+        /// <summary>
+        /// Start a user account service, whether real or mock
+        /// </summary>
+        /// <param name="testScene"></param>
+        /// <param name="real">Starts a real service if true, a mock service if not</param>
         private static void StartUserAccountService(Scene testScene, bool real)
         {
             IConfigSource config = new IniConfigSource();
@@ -280,8 +298,14 @@ namespace OpenSim.Tests.Common.Setup
             config.AddConfig("UserAccountService");
             config.Configs["Modules"].Set("UserAccountServices", "LocalUserAccountServicesConnector");
             config.Configs["UserAccountService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
+            
             if (real)
-                config.Configs["UserAccountService"].Set("LocalServiceModule", "OpenSim.Services.UserAccountService.dll:UserAccountService");
+                config.Configs["UserAccountService"].Set(
+                    "LocalServiceModule", "OpenSim.Services.UserAccountService.dll:UserAccountService");
+            else
+                config.Configs["UserAccountService"].Set(
+                    "LocalServiceModule", "OpenSim.Tests.Common.dll:MockUserAccountService");
+            
             if (m_userAccountService == null)
             {
                 ISharedRegionModule userAccountService = new LocalUserAccountServicesConnector();
@@ -292,10 +316,9 @@ namespace OpenSim.Tests.Common.Setup
             //    config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestGridService");
             m_userAccountService.AddRegion(testScene);
             m_userAccountService.RegionLoaded(testScene);
-            //testScene.AddRegionModule(m_gridService.Name, m_gridService);
+            testScene.AddRegionModule(m_userAccountService.Name, m_userAccountService);
         }
 
-
         /// <summary>
         /// Setup modules for a scene using their default settings.
         /// </summary>
diff --git a/bin/BulletDotNET.dll b/bin/BulletDotNET.dll
index 8abe03a..40c4348 100644
--- a/bin/BulletDotNET.dll
+++ b/bin/BulletDotNET.dll
diff --git a/bin/Newtonsoft.Json.XML b/bin/Newtonsoft.Json.XML
index b84e336..1a1e56c 100644
--- a/bin/Newtonsoft.Json.XML
+++ b/bin/Newtonsoft.Json.XML
@@ -1,446 +1,3122 @@
 <?xml version="1.0"?>
 <doc>
     <assembly>
-        <name>Newtonsoft.Json</name>
+        <name>Newtonsoft.Json.Net20</name>
     </assembly>
     <members>
-        <member name="M:Newtonsoft.Json.Utilities.StringUtils.ContainsWhiteSpace(System.String)">
+        <member name="T:Newtonsoft.Json.Bson.BsonReader">
             <summary>
-            Determines whether the string contains white space.
+            Represents a reader that provides fast, non-cached, forward-only access to serialized Json data.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonReader">
+            <summary>
+            Represents a reader that provides fast, non-cached, forward-only access to serialized Json data.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonReader.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonReader"/> class with the specified <see cref="T:System.IO.TextReader"/>.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonReader.Read">
+            <summary>
+            Reads the next JSON token from the stream.
+            </summary>
+            <returns>true if the next token was read successfully; false if there are no more tokens to read.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonReader.ReadAsBytes">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:Byte[]"/>.
+            </summary>
+            <returns>A <see cref="T:Byte[]"/> or a null reference if the next JSON token is null.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonReader.Skip">
+            <summary>
+            Skips the children of the current token.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonReader.SetToken(Newtonsoft.Json.JsonToken)">
+            <summary>
+            Sets the current token.
+            </summary>
+            <param name="newToken">The new token.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonReader.SetToken(Newtonsoft.Json.JsonToken,System.Object)">
+            <summary>
+            Sets the current token and value.
+            </summary>
+            <param name="newToken">The new token.</param>
+            <param name="value">The value.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonReader.SetStateBasedOnCurrent">
+            <summary>
+            Sets the state based on current token type.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonReader.System#IDisposable#Dispose">
+            <summary>
+            Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonReader.Dispose(System.Boolean)">
+            <summary>
+            Releases unmanaged and - optionally - managed resources
+            </summary>
+            <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonReader.Close">
+            <summary>
+            Changes the <see cref="T:Newtonsoft.Json.JsonReader.State"/> to Closed. 
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonReader.CurrentState">
+            <summary>
+            Gets the current reader state.
+            </summary>
+            <value>The current reader state.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonReader.QuoteChar">
+            <summary>
+            Gets the quotation mark character used to enclose the value of a string.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonReader.TokenType">
+            <summary>
+            Gets the type of the current Json token. 
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonReader.Value">
+            <summary>
+            Gets the text value of the current Json token.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonReader.ValueType">
+            <summary>
+            Gets The Common Language Runtime (CLR) type for the current Json token.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonReader.Depth">
+            <summary>
+            Gets the depth of the current token in the JSON document.
+            </summary>
+            <value>The depth of the current token in the JSON document.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonReader.State">
+            <summary>
+            Specifies the state of the reader.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonReader.State.Start">
+            <summary>
+            The Read method has not been called.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonReader.State.Complete">
+            <summary>
+            The end of the file has been reached successfully.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonReader.State.Property">
+            <summary>
+            Reader is at a property.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonReader.State.ObjectStart">
+            <summary>
+            Reader is at the start of an object.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonReader.State.Object">
+            <summary>
+            Reader is in an object.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonReader.State.ArrayStart">
+            <summary>
+            Reader is at the start of an array.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonReader.State.Array">
+            <summary>
+            Reader is in an array.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonReader.State.Closed">
+            <summary>
+            The Close method has been called.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonReader.State.PostValue">
+            <summary>
+            Reader has just read a value.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonReader.State.ConstructorStart">
+            <summary>
+            Reader is at the start of a constructor.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonReader.State.Constructor">
+            <summary>
+            Reader in a constructor.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonReader.State.Error">
+            <summary>
+            An error occurred that prevents the read operation from continuing.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonReader.State.Finished">
+            <summary>
+            The end of the file has been reached successfully.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Bson.BsonReader.#ctor(System.IO.Stream)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Bson.BsonReader"/> class.
+            </summary>
+            <param name="stream">The stream.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Bson.BsonReader.#ctor(System.IO.Stream,System.Boolean,System.DateTimeKind)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Bson.BsonReader"/> class.
+            </summary>
+            <param name="stream">The stream.</param>
+            <param name="readRootValueAsArray">if set to <c>true</c> the root object will be read as a JSON array.</param>
+            <param name="dateTimeKindHandling">The <see cref="T:System.DateTimeKind"/> used when reading <see cref="T:System.DateTime"/> values from BSON.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsBytes">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:Byte[]"/>.
             </summary>
-            <param name="s">The string to test for white space.</param>
             <returns>
-                <c>true</c> if the string contains white space; otherwise, <c>false</c>.
+            A <see cref="T:Byte[]"/> or a null reference if the next JSON token is null.
             </returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.StringUtils.IsWhiteSpace(System.String)">
+        <member name="M:Newtonsoft.Json.Bson.BsonReader.Read">
             <summary>
-            Determines whether the string is all white space. Empty string will return false.
+            Reads the next JSON token from the stream.
             </summary>
-            <param name="s">The string to test whether it is all white space.</param>
             <returns>
-                <c>true</c> if the string is all white space; otherwise, <c>false</c>.
+            true if the next token was read successfully; false if there are no more tokens to read.
             </returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.StringUtils.EnsureEndsWith(System.String,System.String)">
+        <member name="P:Newtonsoft.Json.Bson.BsonReader.ReadRootValueAsArray">
             <summary>
-            Ensures the target string ends with the specified string.
+            Gets or sets a value indicating whether the root object will be read as a JSON array.
             </summary>
-            <param name="target">The target.</param>
+            <value>
+                <c>true</c> if the root object will be read as a JSON array; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Newtonsoft.Json.Bson.BsonReader.DateTimeKindHandling">
+            <summary>
+            Gets or sets the <see cref="T:System.DateTimeKind"/> used when reading <see cref="T:System.DateTime"/> values from BSON.
+            </summary>
+            <value>The <see cref="T:System.DateTimeKind"/> used when reading <see cref="T:System.DateTime"/> values from BSON.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.Bson.BsonWriter">
+            <summary>
+            Represents a writer that provides a fast, non-cached, forward-only way of generating Json data.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Linq.JTokenWriter">
+            <summary>
+            Represents a writer that provides a fast, non-cached, forward-only way of generating Json data.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonWriter">
+            <summary>
+            Represents a writer that provides a fast, non-cached, forward-only way of generating Json data.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.#ctor">
+            <summary>
+            Creates an instance of the <c>JsonWriter</c> class. 
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.Flush">
+            <summary>
+            Flushes whatever is in the buffer to the underlying streams and also flushes the underlying stream.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.Close">
+            <summary>
+            Closes this stream and the underlying stream.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteStartObject">
+            <summary>
+            Writes the beginning of a Json object.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteEndObject">
+            <summary>
+            Writes the end of a Json object.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteStartArray">
+            <summary>
+            Writes the beginning of a Json array.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteEndArray">
+            <summary>
+            Writes the end of an array.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteStartConstructor(System.String)">
+            <summary>
+            Writes the start of a constructor with the given name.
+            </summary>
+            <param name="name">The name of the constructor.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteEndConstructor">
+            <summary>
+            Writes the end constructor.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WritePropertyName(System.String)">
+            <summary>
+            Writes the property name of a name/value pair on a Json object.
+            </summary>
+            <param name="name">The name of the property.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteEnd">
+            <summary>
+            Writes the end of the current Json object or array.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteToken(Newtonsoft.Json.JsonReader)">
+            <summary>
+            Writes the current <see cref="T:Newtonsoft.Json.JsonReader"/> token.
+            </summary>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> to read the token from.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteEnd(Newtonsoft.Json.JsonToken)">
+            <summary>
+            Writes the specified end token.
+            </summary>
+            <param name="token">The end token to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteIndent">
+            <summary>
+            Writes indent characters.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValueDelimiter">
+            <summary>
+            Writes the JSON value delimiter.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteIndentSpace">
+            <summary>
+            Writes an indent space.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteNull">
+            <summary>
+            Writes a null value.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteUndefined">
+            <summary>
+            Writes an undefined value.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteRaw(System.String)">
+            <summary>
+            Writes raw JSON without changing the writer's state.
+            </summary>
+            <param name="json">The raw JSON to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteRawValue(System.String)">
+            <summary>
+            Writes raw JSON where a value is expected and updates the writer's state.
+            </summary>
+            <param name="json">The raw JSON to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.String)">
+            <summary>
+            Writes a <see cref="T:System.String"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.String"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Int32)">
+            <summary>
+            Writes a <see cref="T:System.Int32"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Int32"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.UInt32)">
+            <summary>
+            Writes a <see cref="T:System.UInt32"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.UInt32"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Int64)">
+            <summary>
+            Writes a <see cref="T:System.Int64"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Int64"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.UInt64)">
+            <summary>
+            Writes a <see cref="T:System.UInt64"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.UInt64"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Single)">
+            <summary>
+            Writes a <see cref="T:System.Single"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Single"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Double)">
+            <summary>
+            Writes a <see cref="T:System.Double"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Double"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Boolean)">
+            <summary>
+            Writes a <see cref="T:System.Boolean"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Boolean"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Int16)">
+            <summary>
+            Writes a <see cref="T:System.Int16"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Int16"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.UInt16)">
+            <summary>
+            Writes a <see cref="T:System.UInt16"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.UInt16"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Char)">
+            <summary>
+            Writes a <see cref="T:System.Char"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Char"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Byte)">
+            <summary>
+            Writes a <see cref="T:System.Byte"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Byte"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.SByte)">
+            <summary>
+            Writes a <see cref="T:System.SByte"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.SByte"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Decimal)">
+            <summary>
+            Writes a <see cref="T:System.Decimal"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Decimal"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.DateTime)">
+            <summary>
+            Writes a <see cref="T:System.DateTime"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.DateTime"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Nullable{System.Int32})">
+            <summary>
+            Writes a <see cref="T:System.Nullable`1"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Nullable`1"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Nullable{System.UInt32})">
+            <summary>
+            Writes a <see cref="T:System.Nullable`1"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Nullable`1"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Nullable{System.Int64})">
+            <summary>
+            Writes a <see cref="T:System.Nullable`1"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Nullable`1"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Nullable{System.UInt64})">
+            <summary>
+            Writes a <see cref="T:System.Nullable`1"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Nullable`1"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Nullable{System.Single})">
+            <summary>
+            Writes a <see cref="T:System.Nullable`1"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Nullable`1"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Nullable{System.Double})">
+            <summary>
+            Writes a <see cref="T:System.Nullable`1"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Nullable`1"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Nullable{System.Boolean})">
+            <summary>
+            Writes a <see cref="T:System.Nullable`1"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Nullable`1"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Nullable{System.Int16})">
+            <summary>
+            Writes a <see cref="T:System.Nullable`1"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Nullable`1"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Nullable{System.UInt16})">
+            <summary>
+            Writes a <see cref="T:System.Nullable`1"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Nullable`1"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Nullable{System.Char})">
+            <summary>
+            Writes a <see cref="T:System.Nullable`1"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Nullable`1"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Nullable{System.Byte})">
+            <summary>
+            Writes a <see cref="T:System.Nullable`1"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Nullable`1"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Nullable{System.SByte})">
+            <summary>
+            Writes a <see cref="T:System.Nullable`1"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Nullable`1"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Nullable{System.Decimal})">
+            <summary>
+            Writes a <see cref="T:System.Nullable`1"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Nullable`1"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Nullable{System.DateTime})">
+            <summary>
+            Writes a <see cref="T:System.Nullable`1"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Nullable`1"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Byte[])">
+            <summary>
+            Writes a <see cref="T:Byte[]"/> value.
+            </summary>
+            <param name="value">The <see cref="T:Byte[]"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Object)">
+            <summary>
+            Writes a <see cref="T:System.Object"/> value.
+            An error will raised if the value cannot be written as a single JSON token.
+            </summary>
+            <param name="value">The <see cref="T:System.Object"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteComment(System.String)">
+            <summary>
+            Writes out a comment <code>/*...*/</code> containing the specified text. 
+            </summary>
+            <param name="text">Text to place inside the comment.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.WriteWhitespace(System.String)">
+            <summary>
+            Writes out the given white space.
+            </summary>
+            <param name="ws">The string of white space characters.</param>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonWriter.Top">
+            <summary>
+            Gets the top.
+            </summary>
+            <value>The top.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonWriter.WriteState">
+            <summary>
+            Gets the state of the writer.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonWriter.Formatting">
+            <summary>
+            Indicates how the output is formatted.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.#ctor(Newtonsoft.Json.Linq.JContainer)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JTokenWriter"/> class writing to the given <see cref="T:Newtonsoft.Json.Linq.JContainer"/>.
+            </summary>
+            <param name="container">The container being written to.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JTokenWriter"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.Flush">
+            <summary>
+            Flushes whatever is in the buffer to the underlying streams and also flushes the underlying stream.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.Close">
+            <summary>
+            Closes this stream and the underlying stream.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteStartObject">
+            <summary>
+            Writes the beginning of a Json object.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteStartArray">
+            <summary>
+            Writes the beginning of a Json array.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteStartConstructor(System.String)">
+            <summary>
+            Writes the start of a constructor with the given name.
+            </summary>
+            <param name="name">The name of the constructor.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteEnd(Newtonsoft.Json.JsonToken)">
+            <summary>
+            Writes the end.
+            </summary>
+            <param name="token">The token.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WritePropertyName(System.String)">
+            <summary>
+            Writes the property name of a name/value pair on a Json object.
+            </summary>
+            <param name="name">The name of the property.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteNull">
+            <summary>
+            Writes a null value.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteUndefined">
+            <summary>
+            Writes an undefined value.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteRaw(System.String)">
+            <summary>
+            Writes raw JSON.
+            </summary>
+            <param name="json">The raw JSON to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteComment(System.String)">
+            <summary>
+            Writes out a comment <code>/*...*/</code> containing the specified text.
+            </summary>
+            <param name="text">Text to place inside the comment.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.String)">
+            <summary>
+            Writes a <see cref="T:System.String"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.String"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.Int32)">
+            <summary>
+            Writes a <see cref="T:System.Int32"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Int32"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.UInt32)">
+            <summary>
+            Writes a <see cref="T:System.UInt32"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.UInt32"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.Int64)">
+            <summary>
+            Writes a <see cref="T:System.Int64"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Int64"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.UInt64)">
+            <summary>
+            Writes a <see cref="T:System.UInt64"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.UInt64"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.Single)">
+            <summary>
+            Writes a <see cref="T:System.Single"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Single"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.Double)">
+            <summary>
+            Writes a <see cref="T:System.Double"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Double"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.Boolean)">
+            <summary>
+            Writes a <see cref="T:System.Boolean"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Boolean"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.Int16)">
+            <summary>
+            Writes a <see cref="T:System.Int16"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Int16"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.UInt16)">
+            <summary>
+            Writes a <see cref="T:System.UInt16"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.UInt16"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.Char)">
+            <summary>
+            Writes a <see cref="T:System.Char"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Char"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.Byte)">
+            <summary>
+            Writes a <see cref="T:System.Byte"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Byte"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.SByte)">
+            <summary>
+            Writes a <see cref="T:System.SByte"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.SByte"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.Decimal)">
+            <summary>
+            Writes a <see cref="T:System.Decimal"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Decimal"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.DateTime)">
+            <summary>
+            Writes a <see cref="T:System.DateTime"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.DateTime"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteValue(System.Byte[])">
+            <summary>
+            Writes a <see cref="T:Byte[]"/> value.
+            </summary>
+            <param name="value">The <see cref="T:Byte[]"/> value to write.</param>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JTokenWriter.Token">
+            <summary>
+            Gets the token being writen.
+            </summary>
+            <value>The token being writen.</value>
+        </member>
+        <member name="M:Newtonsoft.Json.Bson.BsonWriter.#ctor(System.IO.Stream)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Bson.BsonWriter"/> class.
+            </summary>
+            <param name="stream">The stream.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Bson.BsonWriter.Flush">
+            <summary>
+            Flushes whatever is in the buffer to the underlying streams and also flushes the underlying stream.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Bson.BsonWriter.WriteEnd(Newtonsoft.Json.JsonToken)">
+            <summary>
+            Writes the end.
+            </summary>
+            <param name="token">The token.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Bson.BsonWriter.WriteComment(System.String)">
+            <summary>
+            Writes out a comment <code>/*...*/</code> containing the specified text.
+            </summary>
+            <param name="text">Text to place inside the comment.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Bson.BsonWriter.WriteStartConstructor(System.String)">
+            <summary>
+            Writes the start of a constructor with the given name.
+            </summary>
+            <param name="name">The name of the constructor.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Bson.BsonWriter.WriteRaw(System.String)">
+            <summary>
+            Writes raw JSON.
+            </summary>
+            <param name="json">The raw JSON to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Bson.BsonWriter.WriteRawValue(System.String)">
+            <summary>
+            Writes raw JSON where a value is expected and updates the writer's state.
+            </summary>
+            <param name="json">The raw JSON to write.</param>
+        </member>
+        <member name="T:Newtonsoft.Json.ConstructorHandling">
+            <summary>
+            Specifies how constructors are used when initializing objects during deserialization by the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.ConstructorHandling.Default">
+            <summary>
+            First attempt to use the public default constructor then fall back to single paramatized constructor.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.ConstructorHandling.AllowNonPublicDefaultConstructor">
+            <summary>
+            Allow Json.NET to use a non-public default constructor.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Converters.BinaryConverter">
+            <summary>
+            Converts a binary value to and from a base 64 string value.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonConverter">
+            <summary>
+            Converts an object to and from JSON.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
+            <summary>
+            Writes the JSON representation of the object.
+            </summary>
+            <param name="writer">The <see cref="T:Newtonsoft.Json.JsonWriter"/> to write to.</param>
             <param name="value">The value.</param>
-            <returns>The target string with the value string at the end.</returns>
+            <param name="serializer">The calling serializer.</param>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.StringUtils.IsNullOrEmpty(System.Data.SqlTypes.SqlString)">
+        <member name="M:Newtonsoft.Json.JsonConverter.ReadJson(Newtonsoft.Json.JsonReader,System.Type,Newtonsoft.Json.JsonSerializer)">
             <summary>
-            Determines whether the SqlString is null or empty.
+            Reads the JSON representation of the object.
             </summary>
-            <param name="s">The string.</param>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> to read from.</param>
+            <param name="objectType">Type of the object.</param>
+            <param name="serializer">The calling serializer.</param>
+            <returns>The object value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConverter.CanConvert(System.Type)">
+            <summary>
+            Determines whether this instance can convert the specified object type.
+            </summary>
+            <param name="objectType">Type of the object.</param>
             <returns>
-                <c>true</c> if the SqlString is null or empty; otherwise, <c>false</c>.
+                <c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
             </returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.StringUtils.IfNotNullOrEmpty(System.String,System.Action{System.String})">
+        <member name="M:Newtonsoft.Json.Converters.BinaryConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
             <summary>
-            Perform an action if the string is not null or empty.
+            Writes the JSON representation of the object.
             </summary>
+            <param name="writer">The <see cref="T:Newtonsoft.Json.JsonWriter"/> to write to.</param>
             <param name="value">The value.</param>
-            <param name="action">The action to perform.</param>
+            <param name="serializer">The calling serializer.</param>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.StringUtils.Indent(System.String,System.Int32)">
+        <member name="M:Newtonsoft.Json.Converters.BinaryConverter.ReadJson(Newtonsoft.Json.JsonReader,System.Type,Newtonsoft.Json.JsonSerializer)">
             <summary>
-            Indents the specified string.
+            Reads the JSON representation of the object.
             </summary>
-            <param name="s">The string to indent.</param>
-            <param name="indentation">The number of characters to indent by.</param>
-            <returns></returns>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> to read from.</param>
+            <param name="objectType">Type of the object.</param>
+            <param name="serializer">The calling serializer.</param>
+            <returns>The object value.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.StringUtils.Indent(System.String,System.Int32,System.Char)">
+        <member name="M:Newtonsoft.Json.Converters.BinaryConverter.CanConvert(System.Type)">
             <summary>
-            Indents the specified string.
+            Determines whether this instance can convert the specified object type.
             </summary>
-            <param name="s">The string to indent.</param>
-            <param name="indentation">The number of characters to indent by.</param>
-            <param name="indentChar">The indent character.</param>
-            <returns></returns>
+            <param name="objectType">Type of the object.</param>
+            <returns>
+                <c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
+            </returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.StringUtils.NumberLines(System.String)">
+        <member name="T:Newtonsoft.Json.Converters.CustomCreationConverter`1">
             <summary>
-            Numbers the lines.
+            Create a custom object
             </summary>
-            <param name="s">The string to number.</param>
+            <typeparam name="T"></typeparam>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.CustomCreationConverter`1.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
+            <summary>
+            Writes the JSON representation of the object.
+            </summary>
+            <param name="writer">The <see cref="T:Newtonsoft.Json.JsonWriter"/> to write to.</param>
+            <param name="value">The value.</param>
+            <param name="serializer">The calling serializer.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.CustomCreationConverter`1.ReadJson(Newtonsoft.Json.JsonReader,System.Type,Newtonsoft.Json.JsonSerializer)">
+            <summary>
+            Reads the JSON representation of the object.
+            </summary>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> to read from.</param>
+            <param name="objectType">Type of the object.</param>
+            <param name="serializer">The calling serializer.</param>
+            <returns>The object value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.CustomCreationConverter`1.Create(System.Type)">
+            <summary>
+            Creates an object which will then be populated by the serializer.
+            </summary>
+            <param name="objectType">Type of the object.</param>
             <returns></returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.StringUtils.NullEmptyString(System.String)">
+        <member name="M:Newtonsoft.Json.Converters.CustomCreationConverter`1.CanConvert(System.Type)">
             <summary>
-            Nulls an empty string.
+            Determines whether this instance can convert the specified object type.
             </summary>
-            <param name="s">The string.</param>
-            <returns>Null if the string was null, otherwise the string unchanged.</returns>
+            <param name="objectType">Type of the object.</param>
+            <returns>
+                <c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
+            </returns>
         </member>
-        <member name="T:Newtonsoft.Json.JsonReaderException">
+        <member name="T:Newtonsoft.Json.Converters.DataSetConverter">
             <summary>
-            The exception thrown when an error occurs while reading Json text.
+            Converts a <see cref="T:System.Data.DataSet"/> to and from JSON.
             </summary>
         </member>
-        <member name="M:Newtonsoft.Json.JsonReaderException.#ctor">
+        <member name="M:Newtonsoft.Json.Converters.DataSetConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
             <summary>
-            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonReaderException"/> class.
+            Writes the JSON representation of the object.
             </summary>
+            <param name="writer">The <see cref="T:Newtonsoft.Json.JsonWriter"/> to write to.</param>
+            <param name="value">The value.</param>
+            <param name="serializer">The calling serializer.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JsonReaderException.#ctor(System.String)">
+        <member name="M:Newtonsoft.Json.Converters.DataSetConverter.ReadJson(Newtonsoft.Json.JsonReader,System.Type,Newtonsoft.Json.JsonSerializer)">
             <summary>
-            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonReaderException"/> class
-            with a specified error message.
+            Reads the JSON representation of the object.
             </summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> to read from.</param>
+            <param name="objectType">Type of the object.</param>
+            <param name="serializer">The calling serializer.</param>
+            <returns>The object value.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonReaderException.#ctor(System.String,System.Exception)">
+        <member name="M:Newtonsoft.Json.Converters.DataSetConverter.CanConvert(System.Type)">
             <summary>
-            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonReaderException"/> class
-            with a specified error message and a reference to the inner exception that is the cause of this exception.
+            Determines whether this instance can convert the specified value type.
             </summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-            <param name="innerException">The exception that is the cause of the current exception, or a null reference (Nothing in Visual Basic) if no inner exception is specified.</param>
+            <param name="valueType">Type of the value.</param>
+            <returns>
+                <c>true</c> if this instance can convert the specified value type; otherwise, <c>false</c>.
+            </returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.GetListItemType(System.Type)">
+        <member name="T:Newtonsoft.Json.Converters.DataTableConverter">
             <summary>
-            Gets the type of the typed list's items.
+            Converts a <see cref="T:System.Data.DataTable"/> to and from JSON.
             </summary>
-            <param name="type">The type.</param>
-            <returns>The type of the typed list's items.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.ItemsUnitializedValue``1(System.Collections.Generic.IList{``0})">
+        <member name="M:Newtonsoft.Json.Converters.DataTableConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
             <summary>
-            Tests whether the list's items are their unitialized value.
+            Writes the JSON representation of the object.
             </summary>
-            <param name="list">The list.</param>
-            <returns>Whether the list's items are their unitialized value</returns>
+            <param name="writer">The <see cref="T:Newtonsoft.Json.JsonWriter"/> to write to.</param>
+            <param name="value">The value.</param>
+            <param name="serializer">The calling serializer.</param>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.GetMemberUnderlyingType(System.Reflection.MemberInfo)">
+        <member name="M:Newtonsoft.Json.Converters.DataTableConverter.ReadJson(Newtonsoft.Json.JsonReader,System.Type,Newtonsoft.Json.JsonSerializer)">
             <summary>
-            Gets the member's underlying type.
+            Reads the JSON representation of the object.
             </summary>
-            <param name="member">The member.</param>
-            <returns>The underlying type of the member.</returns>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> to read from.</param>
+            <param name="objectType">Type of the object.</param>
+            <param name="serializer">The calling serializer.</param>
+            <returns>The object value.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.IsIndexedProperty(System.Reflection.MemberInfo)">
+        <member name="M:Newtonsoft.Json.Converters.DataTableConverter.CanConvert(System.Type)">
             <summary>
-            Determines whether the member is an indexed property.
+            Determines whether this instance can convert the specified value type.
             </summary>
-            <param name="member">The member.</param>
+            <param name="valueType">Type of the value.</param>
             <returns>
-                <c>true</c> if the member is an indexed property; otherwise, <c>false</c>.
+                <c>true</c> if this instance can convert the specified value type; otherwise, <c>false</c>.
             </returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.IsIndexedProperty(System.Reflection.PropertyInfo)">
+        <member name="T:Newtonsoft.Json.Converters.DateTimeConverterBase">
             <summary>
-            Determines whether the property is an indexed property.
+            Provides a base class for converting a <see cref="T:System.DateTime"/> to and from JSON.
             </summary>
-            <param name="property">The property.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.DateTimeConverterBase.CanConvert(System.Type)">
+            <summary>
+            Determines whether this instance can convert the specified object type.
+            </summary>
+            <param name="objectType">Type of the object.</param>
             <returns>
-                <c>true</c> if the property is an indexed property; otherwise, <c>false</c>.
+                <c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
             </returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.GetMemberValue(System.Reflection.MemberInfo,System.Object)">
+        <member name="T:Newtonsoft.Json.Converters.StringEnumConverter">
             <summary>
-            Gets the member's value on the object.
+            Converts an <see cref="T:System.Enum"/> to and from its name string value.
             </summary>
-            <param name="member">The member.</param>
-            <param name="target">The target object.</param>
-            <returns>The member's value on the object.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.SetMemberValue(System.Reflection.MemberInfo,System.Object,System.Object)">
+        <member name="M:Newtonsoft.Json.Converters.StringEnumConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
             <summary>
-            Sets the member's value on the target object.
+            Writes the JSON representation of the object.
             </summary>
-            <param name="member">The member.</param>
-            <param name="target">The target.</param>
+            <param name="writer">The <see cref="T:Newtonsoft.Json.JsonWriter"/> to write to.</param>
             <param name="value">The value.</param>
+            <param name="serializer">The calling serializer.</param>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.CanReadMemberValue(System.Reflection.MemberInfo)">
+        <member name="M:Newtonsoft.Json.Converters.StringEnumConverter.ReadJson(Newtonsoft.Json.JsonReader,System.Type,Newtonsoft.Json.JsonSerializer)">
             <summary>
-            Determines whether the specified MemberInfo can be read.
+            Reads the JSON representation of the object.
             </summary>
-            <param name="member">The MemberInfo to determine whether can be read.</param>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> to read from.</param>
+            <param name="objectType">Type of the object.</param>
+            <param name="serializer">The calling serializer.</param>
+            <returns>The object value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.StringEnumConverter.CanConvert(System.Type)">
+            <summary>
+            Determines whether this instance can convert the specified object type.
+            </summary>
+            <param name="objectType">Type of the object.</param>
             <returns>
-                <c>true</c> if the specified MemberInfo can be read; otherwise, <c>false</c>.
+                <c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
             </returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.CanSetMemberValue(System.Reflection.MemberInfo)">
+        <member name="T:Newtonsoft.Json.Linq.ComponentModel.JPropertyDescriptor">
             <summary>
-            Determines whether the specified MemberInfo can be set.
+            Represents a view of a <see cref="T:Newtonsoft.Json.Linq.JProperty"/>.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JPropertyDescriptor.#ctor(System.String,System.Type)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.ComponentModel.JPropertyDescriptor"/> class.
+            </summary>
+            <param name="name">The name.</param>
+            <param name="propertyType">Type of the property.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JPropertyDescriptor.CanResetValue(System.Object)">
+            <summary>
+            When overridden in a derived class, returns whether resetting an object changes its value.
             </summary>
-            <param name="member">The MemberInfo to determine whether can be set.</param>
             <returns>
-                <c>true</c> if the specified MemberInfo can be set; otherwise, <c>false</c>.
+            true if resetting the component changes its value; otherwise, false.
             </returns>
+            <param name="component">The component to test for reset capability. 
+                            </param>
         </member>
-        <member name="T:Newtonsoft.Json.ReferenceLoopHandling">
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JPropertyDescriptor.GetValue(System.Object)">
             <summary>
-            Specifies reference loop handling options for the <see cref="T:Newtonsoft.Json.JsonWriter"/>.
+            When overridden in a derived class, gets the current value of the property on a component.
             </summary>
+            <returns>
+            The value of a property for a given component.
+            </returns>
+            <param name="component">The component with the property for which to retrieve the value. 
+                            </param>
         </member>
-        <member name="F:Newtonsoft.Json.ReferenceLoopHandling.Error">
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JPropertyDescriptor.ResetValue(System.Object)">
             <summary>
-            Throw a <see cref="T:Newtonsoft.Json.JsonSerializationException"/> when a loop is encountered.
+            When overridden in a derived class, resets the value for this property of the component to the default value.
             </summary>
+            <param name="component">The component with the property value that is to be reset to the default value. 
+                            </param>
         </member>
-        <member name="F:Newtonsoft.Json.ReferenceLoopHandling.Ignore">
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JPropertyDescriptor.SetValue(System.Object,System.Object)">
             <summary>
-            Ignore loop references and do not serialize.
+            When overridden in a derived class, sets the value of the component to a different value.
             </summary>
+            <param name="component">The component with the property value that is to be set. 
+                            </param><param name="value">The new value. 
+                            </param>
         </member>
-        <member name="F:Newtonsoft.Json.ReferenceLoopHandling.Serialize">
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JPropertyDescriptor.ShouldSerializeValue(System.Object)">
             <summary>
-            Serialize loop references.
+            When overridden in a derived class, determines a value indicating whether the value of this property needs to be persisted.
             </summary>
+            <returns>
+            true if the property should be persisted; otherwise, false.
+            </returns>
+            <param name="component">The component with the property to be examined for persistence. 
+                            </param>
         </member>
-        <member name="T:Newtonsoft.Json.JsonSerializer">
+        <member name="P:Newtonsoft.Json.Linq.ComponentModel.JPropertyDescriptor.ComponentType">
             <summary>
-            Serializes and deserializes objects into and from the Json format.
-            The <see cref="T:Newtonsoft.Json.JsonSerializer"/> enables you to control how objects are encoded into Json.
+            When overridden in a derived class, gets the type of the component this property is bound to.
             </summary>
+            <returns>
+            A <see cref="T:System.Type"/> that represents the type of component this property is bound to. When the <see cref="M:System.ComponentModel.PropertyDescriptor.GetValue(System.Object)"/> or <see cref="M:System.ComponentModel.PropertyDescriptor.SetValue(System.Object,System.Object)"/> methods are invoked, the object specified might be an instance of this type.
+            </returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonSerializer.#ctor">
+        <member name="P:Newtonsoft.Json.Linq.ComponentModel.JPropertyDescriptor.IsReadOnly">
             <summary>
-            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonSerializer"/> class.
+            When overridden in a derived class, gets a value indicating whether this property is read-only.
             </summary>
+            <returns>
+            true if the property is read-only; otherwise, false.
+            </returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonSerializer.Deserialize(Newtonsoft.Json.JsonReader)">
+        <member name="P:Newtonsoft.Json.Linq.ComponentModel.JPropertyDescriptor.PropertyType">
             <summary>
-            Deserializes the Json structure contained by the specified <see cref="T:Newtonsoft.Json.JsonReader"/>.
+            When overridden in a derived class, gets the type of the property.
             </summary>
-            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> that contains the Json structure to deserialize.</param>
-            <returns>The <see cref="T:System.Object"/> being deserialized.</returns>
+            <returns>
+            A <see cref="T:System.Type"/> that represents the type of the property.
+            </returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonSerializer.Deserialize(Newtonsoft.Json.JsonReader,System.Type)">
+        <member name="P:Newtonsoft.Json.Linq.ComponentModel.JPropertyDescriptor.NameHashCode">
             <summary>
-            Deserializes the Json structure contained by the specified <see cref="T:Newtonsoft.Json.JsonReader"/>
-            into an instance of the specified type.
+            Gets the hash code for the name of the member.
             </summary>
-            <param name="reader">The type of object to create.</param>
-            <param name="objectType">The <see cref="T:System.Type"/> of object being deserialized.</param>
-            <returns>The instance of <paramref name="objectType"/> being deserialized.</returns>
+            <value></value>
+            <returns>
+            The hash code for the name of the member.
+            </returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonSerializer.Serialize(System.IO.TextWriter,System.Object)">
+        <member name="T:Newtonsoft.Json.Linq.ComponentModel.JTypeDescriptor">
             <summary>
-            Serializes the specified <see cref="T:System.Object"/> and writes the Json structure
-            to a <c>Stream</c> using the specified <see cref="T:System.IO.TextWriter"/>. 
+            Represents a view of a <see cref="T:Newtonsoft.Json.Linq.JObject"/>.
             </summary>
-            <param name="textWriter">The <see cref="T:System.IO.TextWriter"/> used to write the Json structure.</param>
-            <param name="value">The <see cref="T:System.Object"/> to serialize.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JsonSerializer.Serialize(Newtonsoft.Json.JsonWriter,System.Object)">
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JTypeDescriptor.#ctor(Newtonsoft.Json.Linq.JObject)">
             <summary>
-            Serializes the specified <see cref="T:System.Object"/> and writes the Json structure
-            to a <c>Stream</c> using the specified <see cref="T:Newtonsoft.Json.JsonWriter"/>. 
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.ComponentModel.JTypeDescriptor"/> class.
             </summary>
-            <param name="jsonWriter">The <see cref="T:Newtonsoft.Json.JsonWriter"/> used to write the Json structure.</param>
-            <param name="value">The <see cref="T:System.Object"/> to serialize.</param>
+            <param name="value">The value.</param>
         </member>
-        <member name="P:Newtonsoft.Json.JsonSerializer.ReferenceLoopHandling">
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JTypeDescriptor.GetProperties">
             <summary>
-            Get or set how reference loops (e.g. a class referencing itself) is handled.
+            Returns the properties for this instance of a component.
+            </summary>
+            <returns>
+            A <see cref="T:System.ComponentModel.PropertyDescriptorCollection"/> that represents the properties for this component instance.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JTypeDescriptor.GetProperties(System.Attribute[])">
+            <summary>
+            Returns the properties for this instance of a component using the attribute array as a filter.
+            </summary>
+            <param name="attributes">An array of type <see cref="T:System.Attribute"/> that is used as a filter.</param>
+            <returns>
+            A <see cref="T:System.ComponentModel.PropertyDescriptorCollection"/> that represents the filtered properties for this component instance.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JTypeDescriptor.GetAttributes">
+            <summary>
+            Returns a collection of custom attributes for this instance of a component.
+            </summary>
+            <returns>
+            An <see cref="T:System.ComponentModel.AttributeCollection"/> containing the attributes for this object.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JTypeDescriptor.GetClassName">
+            <summary>
+            Returns the class name of this instance of a component.
+            </summary>
+            <returns>
+            The class name of the object, or null if the class does not have a name.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JTypeDescriptor.GetComponentName">
+            <summary>
+            Returns the name of this instance of a component.
+            </summary>
+            <returns>
+            The name of the object, or null if the object does not have a name.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JTypeDescriptor.GetConverter">
+            <summary>
+            Returns a type converter for this instance of a component.
+            </summary>
+            <returns>
+            A <see cref="T:System.ComponentModel.TypeConverter"/> that is the converter for this object, or null if there is no <see cref="T:System.ComponentModel.TypeConverter"/> for this object.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JTypeDescriptor.GetDefaultEvent">
+            <summary>
+            Returns the default event for this instance of a component.
+            </summary>
+            <returns>
+            An <see cref="T:System.ComponentModel.EventDescriptor"/> that represents the default event for this object, or null if this object does not have events.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JTypeDescriptor.GetDefaultProperty">
+            <summary>
+            Returns the default property for this instance of a component.
+            </summary>
+            <returns>
+            A <see cref="T:System.ComponentModel.PropertyDescriptor"/> that represents the default property for this object, or null if this object does not have properties.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JTypeDescriptor.GetEditor(System.Type)">
+            <summary>
+            Returns an editor of the specified type for this instance of a component.
+            </summary>
+            <param name="editorBaseType">A <see cref="T:System.Type"/> that represents the editor for this object.</param>
+            <returns>
+            An <see cref="T:System.Object"/> of the specified type that is the editor for this object, or null if the editor cannot be found.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JTypeDescriptor.GetEvents(System.Attribute[])">
+            <summary>
+            Returns the events for this instance of a component using the specified attribute array as a filter.
+            </summary>
+            <param name="attributes">An array of type <see cref="T:System.Attribute"/> that is used as a filter.</param>
+            <returns>
+            An <see cref="T:System.ComponentModel.EventDescriptorCollection"/> that represents the filtered events for this component instance.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JTypeDescriptor.GetEvents">
+            <summary>
+            Returns the events for this instance of a component.
+            </summary>
+            <returns>
+            An <see cref="T:System.ComponentModel.EventDescriptorCollection"/> that represents the events for this component instance.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.ComponentModel.JTypeDescriptor.GetPropertyOwner(System.ComponentModel.PropertyDescriptor)">
+            <summary>
+            Returns an object that contains the property described by the specified property descriptor.
+            </summary>
+            <param name="pd">A <see cref="T:System.ComponentModel.PropertyDescriptor"/> that represents the property whose owner is to be found.</param>
+            <returns>
+            An <see cref="T:System.Object"/> that represents the owner of the specified property.
+            </returns>
+        </member>
+        <member name="T:Newtonsoft.Json.Linq.JRaw">
+            <summary>
+            Represents a raw JSON string.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Linq.JValue">
+            <summary>
+            Represents a value in JSON (string, integer, date, etc).
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Represents an abstract JSON token.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Linq.IJEnumerable`1">
+            <summary>
+            Represents a collection of <see cref="T:Newtonsoft.Json.Linq.JToken"/> objects.
+            </summary>
+            <typeparam name="T">The type of token</typeparam>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.IJEnumerable`1.Item(System.Object)">
+            <summary>
+            Gets the <see cref="T:Newtonsoft.Json.Linq.IJEnumerable`1"/> with the specified key.
+            </summary>
+            <value></value>
+        </member>
+        <member name="T:Newtonsoft.Json.IJsonLineInfo">
+            <summary>
+            Provides an interface to enable a class to return line and position information.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.IJsonLineInfo.HasLineInfo">
+            <summary>
+            Gets a value indicating whether the class can return line information.
+            </summary>
+            <returns>
+                <c>true</c> if LineNumber and LinePosition can be provided; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="P:Newtonsoft.Json.IJsonLineInfo.LineNumber">
+            <summary>
+            Gets the current line number.
+            </summary>
+            <value>The current line number or 0 if no line information is available (for example, HasLineInfo returns false).</value>
+        </member>
+        <member name="P:Newtonsoft.Json.IJsonLineInfo.LinePosition">
+            <summary>
+            Gets the current line position.
+            </summary>
+            <value>The current line position or 0 if no line information is available (for example, HasLineInfo returns false).</value>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.DeepEquals(Newtonsoft.Json.Linq.JToken,Newtonsoft.Json.Linq.JToken)">
+            <summary>
+            Compares the values of two tokens, including the values of all descendant tokens.
             </summary>
+            <param name="t1">The first <see cref="T:Newtonsoft.Json.Linq.JToken"/> to compare.</param>
+            <param name="t2">The second <see cref="T:Newtonsoft.Json.Linq.JToken"/> to compare.</param>
+            <returns>true if the tokens are equal; otherwise false.</returns>
         </member>
-        <member name="T:Newtonsoft.Json.JavaScriptArray">
+        <member name="M:Newtonsoft.Json.Linq.JToken.AddAfterSelf(System.Object)">
             <summary>
-            Represents a JavaScript array.
+            Adds the specified content immediately after this token.
             </summary>
+            <param name="content">A content object that contains simple content or a collection of content objects to be added after this token.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptArray.#ctor">
+        <member name="M:Newtonsoft.Json.Linq.JToken.AddBeforeSelf(System.Object)">
             <summary>
-            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JavaScriptObject"/> class.
+            Adds the specified content immediately before this token.
             </summary>
+            <param name="content">A content object that contains simple content or a collection of content objects to be added before this token.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptArray.#ctor(System.Collections.Generic.IEnumerable{System.Object})">
+        <member name="M:Newtonsoft.Json.Linq.JToken.Ancestors">
             <summary>
-            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JavaScriptArray"/> class that
-            contains elements copied from the specified collection.
+            Returns a collection of the ancestor tokens of this token.
             </summary>
-            <param name="collection">The collection whose elements are copied to the new array.</param>
+            <returns>A collection of the ancestor tokens of this token.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptArray.#ctor(System.Int32)">
+        <member name="M:Newtonsoft.Json.Linq.JToken.AfterSelf">
             <summary>
-            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JavaScriptArray"/> class that
-            is empty and has the specified initial capacity.
+            Returns a collection of the sibling tokens after this token, in document order.
             </summary>
-            <param name="capacity">The number of elements that the new array can initially store.</param>
+            <returns>A collection of the sibling tokens after this tokens, in document order.</returns>
         </member>
-        <member name="T:Newtonsoft.Json.JavaScriptConvert">
+        <member name="M:Newtonsoft.Json.Linq.JToken.BeforeSelf">
             <summary>
-            Provides methods for converting between common language runtime types and JavaScript types.
+            Returns a collection of the sibling tokens before this token, in document order.
             </summary>
+            <returns>A collection of the sibling tokens before this token, in document order.</returns>
         </member>
-        <member name="F:Newtonsoft.Json.JavaScriptConvert.True">
+        <member name="M:Newtonsoft.Json.Linq.JToken.Value``1(System.Object)">
+            <summary>
+            Gets the <see cref="T:Newtonsoft.Json.Linq.JToken"/> with the specified key converted to the specified type.
+            </summary>
+            <typeparam name="T">The type to convert the token to.</typeparam>
+            <param name="key">The token key.</param>
+            <returns>The converted token value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.Children">
+            <summary>
+            Returns a collection of the child tokens of this token, in document order.
+            </summary>
+            <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> containing the child tokens of this <see cref="T:Newtonsoft.Json.Linq.JToken"/>, in document order.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.Children``1">
+            <summary>
+            Returns a collection of the child tokens of this token, in document order, filtered by the specified type.
+            </summary>
+            <typeparam name="T">The type to filter the child tokens on.</typeparam>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JEnumerable`1"/> containing the child tokens of this <see cref="T:Newtonsoft.Json.Linq.JToken"/>, in document order.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.Values``1">
+            <summary>
+            Returns a collection of the child values of this token, in document order.
+            </summary>
+            <typeparam name="T">The type to convert the values to.</typeparam>
+            <returns>A <see cref="T:System.Collections.Generic.IEnumerable`1"/> containing the child values of this <see cref="T:Newtonsoft.Json.Linq.JToken"/>, in document order.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.Remove">
+            <summary>
+            Removes this token from its parent.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.Replace(Newtonsoft.Json.Linq.JToken)">
+            <summary>
+            Replaces this token with the specified token.
+            </summary>
+            <param name="value">The value.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.WriteTo(Newtonsoft.Json.JsonWriter,Newtonsoft.Json.JsonConverter[])">
+            <summary>
+            Writes this token to a <see cref="T:Newtonsoft.Json.JsonWriter"/>.
+            </summary>
+            <param name="writer">A <see cref="T:Newtonsoft.Json.JsonWriter"/> into which this method will write.</param>
+            <param name="converters">A collection of <see cref="T:Newtonsoft.Json.JsonConverter"/> which will be used when writing the token.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.ToString">
+            <summary>
+            Returns the indented JSON for this token.
+            </summary>
+            <returns>
+            The indented JSON for this token.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.ToString(Newtonsoft.Json.Formatting,Newtonsoft.Json.JsonConverter[])">
+            <summary>
+            Returns the JSON for this token using the given formatting and converters.
+            </summary>
+            <param name="formatting">Indicates how the output is formatted.</param>
+            <param name="converters">A collection of <see cref="T:Newtonsoft.Json.JsonConverter"/> which will be used when writing the token.</param>
+            <returns>The JSON for this token using the given formatting and converters.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Boolean">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Boolean"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Nullable{System.Boolean}">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Int64">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Int64"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Nullable{System.DateTime}">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Nullable{System.Decimal}">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Nullable{System.Double}">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Int32">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Int32"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Nullable{System.Int32}">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.DateTime">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.DateTime"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Nullable{System.Int64}">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Nullable{System.Single}">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Decimal">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Decimal"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Nullable{System.UInt32}">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Nullable{System.UInt64}">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Double">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Double"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Single">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Single"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.String">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.String"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.UInt32">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.UInt32"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.UInt64">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.UInt64"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Explicit(Newtonsoft.Json.Linq.JToken)~System.Byte[]">
+            <summary>
+            Performs an explicit conversion from <see cref="T:Newtonsoft.Json.Linq.JToken"/> to <see cref="T:System.Byte[]"/>.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>The result of the conversion.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Boolean)~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Boolean"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Nullable{System.Boolean})~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Nullable`1"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Int64)~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Nullable`1"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Nullable{System.DateTime})~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Nullable`1"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Nullable{System.Decimal})~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Nullable`1"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Nullable{System.Double})~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Nullable`1"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.UInt16)~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.UInt16"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Int32)~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Int32"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Nullable{System.Int32})~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Nullable`1"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.DateTime)~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.DateTime"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Nullable{System.Int64})~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Nullable`1"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Nullable{System.Single})~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Nullable`1"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Decimal)~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Decimal"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Nullable{System.UInt16})~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Nullable`1"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Nullable{System.UInt32})~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Nullable`1"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Nullable{System.UInt64})~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Nullable`1"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Double)~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Double"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Single)~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Single"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.String)~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.String"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.UInt32)~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.UInt32"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.UInt64)~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.UInt64"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.op_Implicit(System.Byte[])~Newtonsoft.Json.Linq.JToken">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.Byte[]"/> to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="value">The value to create a <see cref="T:Newtonsoft.Json.Linq.JValue"/> from.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JValue"/> initialized with the specified value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.CreateReader">
+            <summary>
+            Creates an <see cref="T:Newtonsoft.Json.JsonReader"/> for this token.
+            </summary>
+            <returns>An <see cref="T:Newtonsoft.Json.JsonReader"/> that can be used to read this token and its descendants.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.FromObject(System.Object)">
+            <summary>
+            Creates a <see cref="T:Newtonsoft.Json.Linq.JToken"/> from an object.
+            </summary>
+            <param name="o">The object that will be used to create <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JToken"/> with the value of the specified object</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.FromObject(System.Object,Newtonsoft.Json.JsonSerializer)">
+            <summary>
+            Creates a <see cref="T:Newtonsoft.Json.Linq.JToken"/> from an object using the specified <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
+            </summary>
+            <param name="o">The object that will be used to create <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</param>
+            <param name="jsonSerializer">The <see cref="T:Newtonsoft.Json.JsonSerializer"/> that will be used when reading the object.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JToken"/> with the value of the specified object</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.ReadFrom(Newtonsoft.Json.JsonReader)">
+            <summary>
+            Creates a <see cref="T:Newtonsoft.Json.Linq.JToken"/> from a <see cref="T:Newtonsoft.Json.JsonReader"/>.
+            </summary>
+            <param name="reader">An <see cref="T:Newtonsoft.Json.JsonReader"/> positioned at the token to read into this <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</param>
+            <returns>
+            An <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the token and its descendant tokens
+            that were read from the reader. The runtime type of the token is determined
+            by the token type of the first token encountered in the reader.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.SelectToken(System.String)">
+            <summary>
+            Selects the token that matches the object path.
+            </summary>
+            <param name="path">
+            The object path from the current <see cref="T:Newtonsoft.Json.Linq.JToken"/> to the <see cref="T:Newtonsoft.Json.Linq.JToken"/>
+            to be returned. This must be a string of property names or array indexes separated
+            by periods, such as <code>Tables[0].DefaultView[0].Price</code> in C# or
+            <code>Tables(0).DefaultView(0).Price</code> in Visual Basic.
+            </param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JToken"/> that matches the object path or a null reference if no matching token is found.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.SelectToken(System.String,System.Boolean)">
+            <summary>
+            Selects the token that matches the object path.
+            </summary>
+            <param name="path">
+            The object path from the current <see cref="T:Newtonsoft.Json.Linq.JToken"/> to the <see cref="T:Newtonsoft.Json.Linq.JToken"/>
+            to be returned. This must be a string of property names or array indexes separated
+            by periods, such as <code>Tables[0].DefaultView[0].Price</code> in C# or
+            <code>Tables(0).DefaultView(0).Price</code> in Visual Basic.
+            </param>
+            <param name="errorWhenNoMatch">A flag to indicate whether an error should be thrown if no token is found.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Linq.JToken"/> that matches the object path.</returns>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JToken.EqualityComparer">
+            <summary>
+            Gets a comparer that can compare two tokens for value equality.
+            </summary>
+            <value>A <see cref="T:Newtonsoft.Json.Linq.JTokenEqualityComparer"/> that can compare two nodes for value equality.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JToken.Parent">
+            <summary>
+            Gets or sets the parent.
+            </summary>
+            <value>The parent.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JToken.Root">
+            <summary>
+            Gets the root <see cref="T:Newtonsoft.Json.Linq.JToken"/> of this <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <value>The root <see cref="T:Newtonsoft.Json.Linq.JToken"/> of this <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JToken.Type">
+            <summary>
+            Gets the node type for this <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <value>The type.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JToken.HasValues">
+            <summary>
+            Gets a value indicating whether this token has childen tokens.
+            </summary>
+            <value>
+                <c>true</c> if this token has child values; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JToken.Next">
+            <summary>
+            Gets the next sibling token of this node.
+            </summary>
+            <value>The <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the next sibling token.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JToken.Previous">
+            <summary>
+            Gets the previous sibling token of this node.
+            </summary>
+            <value>The <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the previous sibling token.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JToken.Item(System.Object)">
+            <summary>
+            Gets the <see cref="T:Newtonsoft.Json.Linq.JToken"/> with the specified key.
+            </summary>
+            <value>The <see cref="T:Newtonsoft.Json.Linq.JToken"/> with the specified key.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JToken.First">
+            <summary>
+            Get the first child token of this token.
+            </summary>
+            <value>A <see cref="T:Newtonsoft.Json.Linq.JToken"/> containing the first child token of the <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JToken.Last">
+            <summary>
+            Get the last child token of this token.
+            </summary>
+            <value>A <see cref="T:Newtonsoft.Json.Linq.JToken"/> containing the last child token of the <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</value>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JValue.#ctor(Newtonsoft.Json.Linq.JValue)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JValue"/> class from another <see cref="T:Newtonsoft.Json.Linq.JValue"/> object.
+            </summary>
+            <param name="other">A <see cref="T:Newtonsoft.Json.Linq.JValue"/> object to copy from.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JValue.#ctor(System.Int64)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JValue"/> class with the given value.
+            </summary>
+            <param name="value">The value.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JValue.#ctor(System.UInt64)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JValue"/> class with the given value.
+            </summary>
+            <param name="value">The value.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JValue.#ctor(System.Double)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JValue"/> class with the given value.
+            </summary>
+            <param name="value">The value.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JValue.#ctor(System.DateTime)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JValue"/> class with the given value.
+            </summary>
+            <param name="value">The value.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JValue.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JValue"/> class with the given value.
+            </summary>
+            <param name="value">The value.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JValue.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JValue"/> class with the given value.
+            </summary>
+            <param name="value">The value.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JValue.#ctor(System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JValue"/> class with the given value.
+            </summary>
+            <param name="value">The value.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JValue.CreateComment(System.String)">
+            <summary>
+            Creates a <see cref="T:Newtonsoft.Json.Linq.JValue"/> comment with the given value.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JValue"/> comment with the given value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JValue.CreateString(System.String)">
+            <summary>
+            Creates a <see cref="T:Newtonsoft.Json.Linq.JValue"/> string with the given value.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JValue"/> string with the given value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JValue.WriteTo(Newtonsoft.Json.JsonWriter,Newtonsoft.Json.JsonConverter[])">
+            <summary>
+            Writes this token to a <see cref="T:Newtonsoft.Json.JsonWriter"/>.
+            </summary>
+            <param name="writer">A <see cref="T:Newtonsoft.Json.JsonWriter"/> into which this method will write.</param>
+            <param name="converters">A collection of <see cref="T:Newtonsoft.Json.JsonConverter"/> which will be used when writing the token.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JValue.Equals(Newtonsoft.Json.Linq.JValue)">
+            <summary>
+            Indicates whether the current object is equal to another object of the same type.
+            </summary>
+            <returns>
+            true if the current object is equal to the <paramref name="other"/> parameter; otherwise, false.
+            </returns>
+            <param name="other">An object to compare with this object.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JValue.Equals(System.Object)">
+            <summary>
+            Determines whether the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>.
+            </summary>
+            <param name="obj">The <see cref="T:System.Object"/> to compare with the current <see cref="T:System.Object"/>.</param>
+            <returns>
+            true if the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>; otherwise, false.
+            </returns>
+            <exception cref="T:System.NullReferenceException">
+            The <paramref name="obj"/> parameter is null.
+            </exception>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JValue.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>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JValue.HasValues">
+            <summary>
+            Gets a value indicating whether this token has childen tokens.
+            </summary>
+            <value>
+                <c>true</c> if this token has child values; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JValue.Type">
+            <summary>
+            Gets the node type for this <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <value>The type.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JValue.Value">
+            <summary>
+            Gets or sets the underlying token value.
+            </summary>
+            <value>The underlying token value.</value>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JRaw.#ctor(Newtonsoft.Json.Linq.JRaw)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JRaw"/> class from another <see cref="T:Newtonsoft.Json.Linq.JRaw"/> object.
+            </summary>
+            <param name="other">A <see cref="T:Newtonsoft.Json.Linq.JRaw"/> object to copy from.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JRaw.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JRaw"/> class.
+            </summary>
+            <param name="rawJson">The raw json.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JRaw.Create(Newtonsoft.Json.JsonReader)">
+            <summary>
+            Creates an instance of <see cref="T:Newtonsoft.Json.Linq.JRaw"/> with the content of the reader's current token.
+            </summary>
+            <param name="reader">The reader.</param>
+            <returns>An instance of <see cref="T:Newtonsoft.Json.Linq.JRaw"/> with the content of the reader's current token.</returns>
+        </member>
+        <member name="T:Newtonsoft.Json.Required">
+            <summary>
+            Indicating whether a property is required.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Required.Default">
+            <summary>
+            The property is not required. The default state.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Required.AllowNull">
+            <summary>
+            The property must be defined in JSON but can be a null value.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Required.Always">
+            <summary>
+            The property must be defined in JSON and cannot be a null value.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Serialization.IReferenceResolver">
+            <summary>
+            Used to resolve references when serializing and deserializing JSON by the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.IReferenceResolver.ResolveReference(System.String)">
+            <summary>
+            Resolves a reference to its object.
+            </summary>
+            <param name="reference">The reference to resolve.</param>
+            <returns>The object that</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.IReferenceResolver.GetReference(System.Object)">
+            <summary>
+            Gets the reference for the sepecified object.
+            </summary>
+            <param name="value">The object to get a reference for.</param>
+            <returns>The reference to the object.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.IReferenceResolver.IsReferenced(System.Object)">
+            <summary>
+            Determines whether the specified object is referenced.
+            </summary>
+            <param name="value">The object to test for a reference.</param>
+            <returns>
+                <c>true</c> if the specified object is referenced; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.IReferenceResolver.AddReference(System.String,System.Object)">
+            <summary>
+            Adds a reference to the specified object.
+            </summary>
+            <param name="reference">The reference.</param>
+            <param name="value">The object to reference.</param>
+        </member>
+        <member name="T:Newtonsoft.Json.PreserveReferencesHandling">
+            <summary>
+            Specifies reference handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.PreserveReferencesHandling.None">
+            <summary>
+            Do not preserve references when serializing types.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.PreserveReferencesHandling.Objects">
+            <summary>
+            Preserve references when serializing into a JSON object structure.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.PreserveReferencesHandling.Arrays">
+            <summary>
+            Preserve references when serializing into a JSON array structure.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.PreserveReferencesHandling.All">
+            <summary>
+            Preserve references when serializing.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonArrayAttribute">
+            <summary>
+            Instructs the <see cref="T:Newtonsoft.Json.JsonSerializer"/> how to serialize the collection.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonContainerAttribute">
+            <summary>
+            Instructs the <see cref="T:Newtonsoft.Json.JsonSerializer"/> how to serialize the object.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonContainerAttribute.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonContainerAttribute"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonContainerAttribute.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonContainerAttribute"/> class with the specified container Id.
+            </summary>
+            <param name="id">The container Id.</param>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonContainerAttribute.Id">
+            <summary>
+            Gets or sets the id.
+            </summary>
+            <value>The id.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonContainerAttribute.Title">
+            <summary>
+            Gets or sets the title.
+            </summary>
+            <value>The title.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonContainerAttribute.Description">
+            <summary>
+            Gets or sets the description.
+            </summary>
+            <value>The description.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonContainerAttribute.IsReference">
+            <summary>
+            Gets or sets a value that indicates whether to preserve object reference data.
+            </summary>
+            <value>
+                <c>true</c> to keep object reference; otherwise, <c>false</c>. The default is <c>false</c>.
+            </value>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonArrayAttribute.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonArrayAttribute"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonArrayAttribute.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonObjectAttribute"/> class with a flag indicating whether the array can contain null items
+            </summary>
+            <param name="allowNullItems">A flag indicating whether the array can contain null items.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonArrayAttribute.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonArrayAttribute"/> class with the specified container Id.
+            </summary>
+            <param name="id">The container Id.</param>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonArrayAttribute.AllowNullItems">
+            <summary>
+            Gets or sets a value indicating whether null items are allowed in the collection.
+            </summary>
+            <value><c>true</c> if null items are allowed in the collection; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.DefaultValueHandling">
+            <summary>
+            Specifies default value handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.DefaultValueHandling.Include">
+            <summary>
+            Include null values when serializing and deserializing objects.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.DefaultValueHandling.Ignore">
+            <summary>
+            Ignore null values when serializing and deserializing objects.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonConverterAttribute">
+            <summary>
+            Instructs the <see cref="T:Newtonsoft.Json.JsonSerializer"/> to use the specified <see cref="T:Newtonsoft.Json.JsonConverter"/> when serializing the member or class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConverterAttribute.#ctor(System.Type)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonConverterAttribute"/> class.
+            </summary>
+            <param name="converterType">Type of the converter.</param>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonConverterAttribute.ConverterType">
+            <summary>
+            Gets the type of the converter.
+            </summary>
+            <value>The type of the converter.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonObjectAttribute">
+            <summary>
+            Instructs the <see cref="T:Newtonsoft.Json.JsonSerializer"/> how to serialize the object.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonObjectAttribute.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonObjectAttribute"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonObjectAttribute.#ctor(Newtonsoft.Json.MemberSerialization)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonObjectAttribute"/> class with the specified member serialization.
+            </summary>
+            <param name="memberSerialization">The member serialization.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonObjectAttribute.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonObjectAttribute"/> class with the specified container Id.
+            </summary>
+            <param name="id">The container Id.</param>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonObjectAttribute.MemberSerialization">
+            <summary>
+            Gets or sets the member serialization.
+            </summary>
+            <value>The member serialization.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonSerializerSettings">
+            <summary>
+            Specifies the settings on a <see cref="T:Newtonsoft.Json.JsonSerializer"/> object.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonSerializerSettings.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonSerializerSettings"/> class.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializerSettings.ReferenceLoopHandling">
+            <summary>
+            Gets or sets how reference loops (e.g. a class referencing itself) is handled.
+            </summary>
+            <value>Reference loop handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializerSettings.MissingMemberHandling">
+            <summary>
+            Gets or sets how missing members (e.g. JSON contains a property that isn't a member on the object) are handled during deserialization.
+            </summary>
+            <value>Missing member handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializerSettings.ObjectCreationHandling">
+            <summary>
+            Gets or sets how objects are created during deserialization.
+            </summary>
+            <value>The object creation handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializerSettings.NullValueHandling">
+            <summary>
+            Gets or sets how null values are handled during serialization and deserialization.
+            </summary>
+            <value>Null value handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializerSettings.DefaultValueHandling">
+            <summary>
+            Gets or sets how null default are handled during serialization and deserialization.
+            </summary>
+            <value>The default value handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializerSettings.Converters">
+            <summary>
+            Gets or sets a collection <see cref="T:Newtonsoft.Json.JsonConverter"/> that will be used during serialization.
+            </summary>
+            <value>The converters.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializerSettings.PreserveReferencesHandling">
+            <summary>
+            Gets or sets how object references are preserved by the serializer.
+            </summary>
+            <value>The preserve references handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializerSettings.TypeNameHandling">
+            <summary>
+            Gets or sets how type name writing and reading is handled by the serializer.
+            </summary>
+            <value>The type name handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializerSettings.ConstructorHandling">
+            <summary>
+            Gets or sets how constructors are used during deserialization.
+            </summary>
+            <value>The constructor handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializerSettings.ContractResolver">
+            <summary>
+            Gets or sets the contract resolver used by the serializer when
+            serializing .NET objects to JSON and vice versa.
+            </summary>
+            <value>The contract resolver.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializerSettings.ReferenceResolver">
+            <summary>
+            Gets or sets the <see cref="T:Newtonsoft.Json.Serialization.IReferenceResolver"/> used by the serializer when resolving references.
+            </summary>
+            <value>The reference resolver.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializerSettings.Binder">
+            <summary>
+            Gets or sets the <see cref="T:System.Runtime.Serialization.SerializationBinder"/> used by the serializer when resolving type names.
+            </summary>
+            <value>The binder.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializerSettings.Error">
+            <summary>
+            Gets or sets the error handler called during serialization and deserialization.
+            </summary>
+            <value>The error handler called during serialization and deserialization.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializerSettings.Context">
+            <summary>
+            Gets or sets the <see cref="T:System.Runtime.Serialization.StreamingContext"/> used by the serializer when invoking serialization callback methods.
+            </summary>
+            <value>The context.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonValidatingReader">
+            <summary>
+            Represents a reader that provides <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> validation.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonValidatingReader.#ctor(Newtonsoft.Json.JsonReader)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonValidatingReader"/> class that
+            validates the content returned from the given <see cref="T:Newtonsoft.Json.JsonReader"/>.
+            </summary>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> to read from while validating.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsBytes">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:Byte[]"/>.
+            </summary>
+            <returns>
+            A <see cref="T:Byte[]"/> or a null reference if the next JSON token is null.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonValidatingReader.Read">
+            <summary>
+            Reads the next JSON token from the stream.
+            </summary>
+            <returns>
+            true if the next token was read successfully; false if there are no more tokens to read.
+            </returns>
+        </member>
+        <member name="E:Newtonsoft.Json.JsonValidatingReader.ValidationEventHandler">
+            <summary>
+            Sets an event handler for receiving schema validation errors.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonValidatingReader.Value">
+            <summary>
+            Gets the text value of the current Json token.
+            </summary>
+            <value></value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonValidatingReader.Depth">
+            <summary>
+            Gets the depth of the current token in the JSON document.
+            </summary>
+            <value>The depth of the current token in the JSON document.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonValidatingReader.QuoteChar">
+            <summary>
+            Gets the quotation mark character used to enclose the value of a string.
+            </summary>
+            <value></value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonValidatingReader.TokenType">
+            <summary>
+            Gets the type of the current Json token.
+            </summary>
+            <value></value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonValidatingReader.ValueType">
+            <summary>
+            Gets The Common Language Runtime (CLR) type for the current Json token.
+            </summary>
+            <value></value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonValidatingReader.Schema">
+            <summary>
+            Gets or sets the schema.
+            </summary>
+            <value>The schema.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonValidatingReader.Reader">
+            <summary>
+            Gets the <see cref="T:Newtonsoft.Json.JsonReader"/> used to construct this <see cref="T:Newtonsoft.Json.JsonValidatingReader"/>.
+            </summary>
+            <value>The <see cref="T:Newtonsoft.Json.JsonReader"/> specified in the constructor.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.Linq.JTokenEqualityComparer">
+            <summary>
+            Compares tokens to determine whether they are equal.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenEqualityComparer.Equals(Newtonsoft.Json.Linq.JToken,Newtonsoft.Json.Linq.JToken)">
+            <summary>
+            Determines whether the specified objects are equal.
+            </summary>
+            <param name="x">The first object of type <paramref name="T"/> to compare.</param>
+            <param name="y">The second object of type <paramref name="T"/> to compare.</param>
+            <returns>
+            true if the specified objects are equal; otherwise, false.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenEqualityComparer.GetHashCode(Newtonsoft.Json.Linq.JToken)">
+            <summary>
+            Returns a hash code for the specified object.
+            </summary>
+            <param name="obj">The <see cref="T:System.Object"/> for which a hash code is to be returned.</param>
+            <returns>A hash code for the specified object.</returns>
+            <exception cref="T:System.ArgumentNullException">The type of <paramref name="obj"/> is a reference type and <paramref name="obj"/> is null.</exception>
+        </member>
+        <member name="T:Newtonsoft.Json.MemberSerialization">
+            <summary>
+            Specifies the member serialization options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.MemberSerialization.OptOut">
+            <summary>
+            All members are serialized by default. Members can be excluded using the <see cref="T:Newtonsoft.Json.JsonIgnoreAttribute"/>.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.MemberSerialization.OptIn">
+            <summary>
+            Only members must be marked with the <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/> are serialized.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.ObjectCreationHandling">
+            <summary>
+            Specifies how object creation is handled by the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.ObjectCreationHandling.Auto">
+            <summary>
+            Reuse existing objects, create new objects when needed.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.ObjectCreationHandling.Reuse">
+            <summary>
+            Only reuse existing objects.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.ObjectCreationHandling.Replace">
+            <summary>
+            Always create new objects.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Converters.IsoDateTimeConverter">
+            <summary>
+            Converts a <see cref="T:System.DateTime"/> to and from the ISO 8601 date format (e.g. 2008-04-12T12:53Z).
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.IsoDateTimeConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
+            <summary>
+            Writes the JSON representation of the object.
+            </summary>
+            <param name="writer">The <see cref="T:Newtonsoft.Json.JsonWriter"/> to write to.</param>
+            <param name="value">The value.</param>
+            <param name="serializer">The calling serializer.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.IsoDateTimeConverter.ReadJson(Newtonsoft.Json.JsonReader,System.Type,Newtonsoft.Json.JsonSerializer)">
+            <summary>
+            Reads the JSON representation of the object.
+            </summary>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> to read from.</param>
+            <param name="objectType">Type of the object.</param>
+            <param name="serializer">The calling serializer.</param>
+            <returns>The object value.</returns>
+        </member>
+        <member name="P:Newtonsoft.Json.Converters.IsoDateTimeConverter.DateTimeStyles">
+            <summary>
+            Gets or sets the date time styles used when converting a date to and from JSON.
+            </summary>
+            <value>The date time styles used when converting a date to and from JSON.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Converters.IsoDateTimeConverter.DateTimeFormat">
+            <summary>
+            Gets or sets the date time format used when converting a date to and from JSON.
+            </summary>
+            <value>The date time format used when converting a date to and from JSON.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Converters.IsoDateTimeConverter.Culture">
+            <summary>
+            Gets or sets the culture used when converting a date to and from JSON.
+            </summary>
+            <value>The culture used when converting a date to and from JSON.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.Converters.JavaScriptDateTimeConverter">
+            <summary>
+            Converts a <see cref="T:System.DateTime"/> to and from a JavaScript date constructor (e.g. new Date(52231943)).
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.JavaScriptDateTimeConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
+            <summary>
+            Writes the JSON representation of the object.
+            </summary>
+            <param name="writer">The <see cref="T:Newtonsoft.Json.JsonWriter"/> to write to.</param>
+            <param name="value">The value.</param>
+            <param name="serializer">The calling serializer.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.JavaScriptDateTimeConverter.ReadJson(Newtonsoft.Json.JsonReader,System.Type,Newtonsoft.Json.JsonSerializer)">
+            <summary>
+            Reads the JSON representation of the object.
+            </summary>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> to read from.</param>
+            <param name="objectType">Type of the object.</param>
+            <param name="serializer">The calling serializer.</param>
+            <returns>The object value.</returns>
+        </member>
+        <member name="T:Newtonsoft.Json.Converters.JsonDateTimeSerializationMode">
+            <summary>
+            Specifies whether a DateTime object represents a local time, a Coordinated Universal Time (UTC), or is not specified as either local time or UTC.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Converters.JsonDateTimeSerializationMode.Local">
+            <summary>
+            The time represented is local time.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Converters.JsonDateTimeSerializationMode.Utc">
+            <summary>
+            The time represented is UTC.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Converters.JsonDateTimeSerializationMode.Unspecified">
+            <summary>
+            The time represented is not specified as either local time or Coordinated Universal Time (UTC).
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Converters.JsonDateTimeSerializationMode.RoundtripKind">
+            <summary>
+            Preserves the DateTimeKind field of a date when a DateTime object is converted to a string and the string is then converted back to a DateTime object.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Converters.XmlNodeConverter">
+            <summary>
+            Converts an <see cref="T:System.Xml.XmlNode"/> to and from JSON.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.XmlNodeConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
+            <summary>
+            Writes the JSON representation of the object.
+            </summary>
+            <param name="writer">The <see cref="T:Newtonsoft.Json.JsonWriter"/> to write to.</param>
+            <param name="serializer">The calling serializer.</param>
+            <param name="value">The value.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.XmlNodeConverter.ReadJson(Newtonsoft.Json.JsonReader,System.Type,Newtonsoft.Json.JsonSerializer)">
+            <summary>
+            Reads the JSON representation of the object.
+            </summary>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> to read from.</param>
+            <param name="objectType">Type of the object.</param>
+            <param name="serializer">The calling serializer.</param>
+            <returns>The object value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.XmlNodeConverter.IsNamespaceAttribute(System.String,System.String@)">
+            <summary>
+            Checks if the attributeName is a namespace attribute.
+            </summary>
+            <param name="attributeName">Attribute name to test.</param>
+            <param name="prefix">The attribute name prefix if it has one, otherwise an empty string.</param>
+            <returns>True if attribute name is for a namespace attribute, otherwise false.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.XmlNodeConverter.CanConvert(System.Type)">
+            <summary>
+            Determines whether this instance can convert the specified value type.
+            </summary>
+            <param name="valueType">Type of the value.</param>
+            <returns>
+                <c>true</c> if this instance can convert the specified value type; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="P:Newtonsoft.Json.Converters.XmlNodeConverter.DeserializeRootElementName">
+            <summary>
+            Gets or sets the name of the root element to insert when deserializing to XML if the JSON structure has produces multiple root elements.
+            </summary>
+            <value>The name of the deserialize root element.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.Converters.HtmlColorConverter">
+            <summary>
+            Converts a <see cref="T:System.Drawing.Color"/> object to and from JSON.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.HtmlColorConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
+            <summary>
+            Writes the JSON representation of the object.
+            </summary>
+            <param name="writer">The <see cref="T:Newtonsoft.Json.JsonWriter"/> to write to.</param>
+            <param name="serializer">The calling serializer.</param>
+            <param name="value">The value.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.HtmlColorConverter.CanConvert(System.Type)">
+            <summary>
+            Determines whether this instance can convert the specified value type.
+            </summary>
+            <param name="valueType">Type of the value.</param>
+            <returns>
+                <c>true</c> if this instance can convert the specified value type; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.HtmlColorConverter.ReadJson(Newtonsoft.Json.JsonReader,System.Type,Newtonsoft.Json.JsonSerializer)">
+            <summary>
+            Reads the JSON representation of the object.
+            </summary>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> to read from.</param>
+            <param name="objectType">Type of the object.</param>
+            <param name="serializer">The calling serializer.</param>
+            <returns>The object value.</returns>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonTextReader">
+            <summary>
+            Represents a reader that provides fast, non-cached, forward-only access to serialized Json data.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextReader.#ctor(System.IO.TextReader)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonReader"/> class with the specified <see cref="T:System.IO.TextReader"/>.
+            </summary>
+            <param name="reader">The <c>TextReader</c> containing the XML data to read.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextReader.Read">
+            <summary>
+            Reads the next JSON token from the stream.
+            </summary>
+            <returns>
+            true if the next token was read successfully; false if there are no more tokens to read.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsBytes">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:Byte[]"/>.
+            </summary>
+            <returns>
+            A <see cref="T:Byte[]"/> or a null reference if the next JSON token is null.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextReader.Close">
+            <summary>
+            Changes the state to closed. 
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextReader.HasLineInfo">
+            <summary>
+            Gets a value indicating whether the class can return line information.
+            </summary>
+            <returns>
+                <c>true</c> if LineNumber and LinePosition can be provided; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonTextReader.LineNumber">
+            <summary>
+            Gets the current line number.
+            </summary>
+            <value>
+            The current line number or 0 if no line information is available (for example, HasLineInfo returns false).
+            </value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonTextReader.LinePosition">
+            <summary>
+            Gets the current line position.
+            </summary>
+            <value>
+            The current line position or 0 if no line information is available (for example, HasLineInfo returns false).
+            </value>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonPropertyAttribute">
+            <summary>
+            Instructs the <see cref="T:Newtonsoft.Json.JsonSerializer"/> to always serialize the member with the specified name.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonPropertyAttribute.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonPropertyAttribute.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/> class with the specified name.
+            </summary>
+            <param name="propertyName">Name of the property.</param>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonPropertyAttribute.NullValueHandling">
+            <summary>
+            Gets or sets the null value handling used when serializing this property.
+            </summary>
+            <value>The null value handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonPropertyAttribute.DefaultValueHandling">
+            <summary>
+            Gets or sets the default value handling used when serializing this property.
+            </summary>
+            <value>The default value handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonPropertyAttribute.ReferenceLoopHandling">
+            <summary>
+            Gets or sets the reference loop handling used when serializing this property.
+            </summary>
+            <value>The reference loop handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonPropertyAttribute.ObjectCreationHandling">
+            <summary>
+            Gets or sets the object creation handling used when deserializing this property.
+            </summary>
+            <value>The object creation handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonPropertyAttribute.IsReference">
+            <summary>
+            Gets or sets whether this property's value is serialized as a reference.
+            </summary>
+            <value>Whether this property's value is serialized as a reference.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonPropertyAttribute.PropertyName">
+            <summary>
+            Gets or sets the name of the property.
+            </summary>
+            <value>The name of the property.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonPropertyAttribute.Required">
+            <summary>
+            Gets or sets a value indicating whether this property is required.
+            </summary>
+            <value>
+                A value indicating whether this property is required.
+            </value>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonIgnoreAttribute">
+            <summary>
+            Instructs the <see cref="T:Newtonsoft.Json.JsonSerializer"/> not to serialize the public field or public read/write property value.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonTextWriter">
+            <summary>
+            Represents a writer that provides a fast, non-cached, forward-only way of generating Json data.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.#ctor(System.IO.TextWriter)">
+            <summary>
+            Creates an instance of the <c>JsonWriter</c> class using the specified <see cref="T:System.IO.TextWriter"/>. 
+            </summary>
+            <param name="textWriter">The <c>TextWriter</c> to write to.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.Flush">
+            <summary>
+            Flushes whatever is in the buffer to the underlying streams and also flushes the underlying stream.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.Close">
+            <summary>
+            Closes this stream and the underlying stream.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteStartObject">
+            <summary>
+            Writes the beginning of a Json object.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteStartArray">
+            <summary>
+            Writes the beginning of a Json array.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteStartConstructor(System.String)">
+            <summary>
+            Writes the start of a constructor with the given name.
+            </summary>
+            <param name="name">The name of the constructor.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteEnd(Newtonsoft.Json.JsonToken)">
+            <summary>
+            Writes the specified end token.
+            </summary>
+            <param name="token">The end token to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WritePropertyName(System.String)">
+            <summary>
+            Writes the property name of a name/value pair on a Json object.
+            </summary>
+            <param name="name">The name of the property.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteIndent">
+            <summary>
+            Writes indent characters.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValueDelimiter">
+            <summary>
+            Writes the JSON value delimiter.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteIndentSpace">
+            <summary>
+            Writes an indent space.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteNull">
+            <summary>
+            Writes a null value.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteUndefined">
+            <summary>
+            Writes an undefined value.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteRaw(System.String)">
+            <summary>
+            Writes raw JSON.
+            </summary>
+            <param name="json">The raw JSON to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.String)">
+            <summary>
+            Writes a <see cref="T:System.String"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.String"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.Int32)">
+            <summary>
+            Writes a <see cref="T:System.Int32"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Int32"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.UInt32)">
+            <summary>
+            Writes a <see cref="T:System.UInt32"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.UInt32"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.Int64)">
+            <summary>
+            Writes a <see cref="T:System.Int64"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Int64"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.UInt64)">
+            <summary>
+            Writes a <see cref="T:System.UInt64"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.UInt64"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.Single)">
+            <summary>
+            Writes a <see cref="T:System.Single"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Single"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.Double)">
+            <summary>
+            Writes a <see cref="T:System.Double"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Double"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.Boolean)">
+            <summary>
+            Writes a <see cref="T:System.Boolean"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Boolean"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.Int16)">
+            <summary>
+            Writes a <see cref="T:System.Int16"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Int16"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.UInt16)">
+            <summary>
+            Writes a <see cref="T:System.UInt16"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.UInt16"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.Char)">
+            <summary>
+            Writes a <see cref="T:System.Char"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Char"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.Byte)">
+            <summary>
+            Writes a <see cref="T:System.Byte"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Byte"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.SByte)">
+            <summary>
+            Writes a <see cref="T:System.SByte"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.SByte"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.Decimal)">
+            <summary>
+            Writes a <see cref="T:System.Decimal"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.Decimal"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.DateTime)">
+            <summary>
+            Writes a <see cref="T:System.DateTime"/> value.
+            </summary>
+            <param name="value">The <see cref="T:System.DateTime"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteValue(System.Byte[])">
+            <summary>
+            Writes a <see cref="T:Byte[]"/> value.
+            </summary>
+            <param name="value">The <see cref="T:Byte[]"/> value to write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteComment(System.String)">
+            <summary>
+            Writes out a comment <code>/*...*/</code> containing the specified text. 
+            </summary>
+            <param name="text">Text to place inside the comment.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextWriter.WriteWhitespace(System.String)">
+            <summary>
+            Writes out the given white space.
+            </summary>
+            <param name="ws">The string of white space characters.</param>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonTextWriter.Indentation">
+            <summary>
+            Gets or sets how many IndentChars to write for each level in the hierarchy when <paramref name="Formatting"/> is set to <c>Formatting.Indented</c>.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonTextWriter.QuoteChar">
+            <summary>
+            Gets or sets which character to use to quote attribute values.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonTextWriter.IndentChar">
+            <summary>
+            Gets or sets which character to use for indenting when <paramref name="Formatting"/> is set to <c>Formatting.Indented</c>.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonTextWriter.QuoteName">
+            <summary>
+            Gets or sets a value indicating whether object names will be surrounded with quotes.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonWriterException">
+            <summary>
+            The exception thrown when an error occurs while reading Json text.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriterException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonWriterException"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriterException.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonWriterException"/> class
+            with a specified error message.
+            </summary>
+            <param name="message">The error message that explains the reason for the exception.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonWriterException.#ctor(System.String,System.Exception)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonWriterException"/> class
+            with a specified error message and a reference to the inner exception that is the cause of this exception.
+            </summary>
+            <param name="message">The error message that explains the reason for the exception.</param>
+            <param name="innerException">The exception that is the cause of the current exception, or a null reference (Nothing in Visual Basic) if no inner exception is specified.</param>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonReaderException">
+            <summary>
+            The exception thrown when an error occurs while reading Json text.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonReaderException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonReaderException"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonReaderException.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonReaderException"/> class
+            with a specified error message.
+            </summary>
+            <param name="message">The error message that explains the reason for the exception.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonReaderException.#ctor(System.String,System.Exception)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonReaderException"/> class
+            with a specified error message and a reference to the inner exception that is the cause of this exception.
+            </summary>
+            <param name="message">The error message that explains the reason for the exception.</param>
+            <param name="innerException">The exception that is the cause of the current exception, or a null reference (Nothing in Visual Basic) if no inner exception is specified.</param>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonReaderException.LineNumber">
+            <summary>
+            Gets the line number indicating where the error occurred.
+            </summary>
+            <value>The line number indicating where the error occurred.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonReaderException.LinePosition">
+            <summary>
+            Gets the line position indicating where the error occurred.
+            </summary>
+            <value>The line position indicating where the error occurred.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonConverterCollection">
+            <summary>
+            Represents a collection of <see cref="T:Newtonsoft.Json.JsonConverter"/>.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.JsonConvert">
+            <summary>
+            Provides methods for converting between common language runtime types and JSON types.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonConvert.True">
             <summary>
             Represents JavaScript's boolean value true as a string. This field is read-only.
             </summary>
         </member>
-        <member name="F:Newtonsoft.Json.JavaScriptConvert.False">
+        <member name="F:Newtonsoft.Json.JsonConvert.False">
             <summary>
             Represents JavaScript's boolean value false as a string. This field is read-only.
             </summary>
         </member>
-        <member name="F:Newtonsoft.Json.JavaScriptConvert.Null">
+        <member name="F:Newtonsoft.Json.JsonConvert.Null">
             <summary>
             Represents JavaScript's null as a string. This field is read-only.
             </summary>
         </member>
-        <member name="F:Newtonsoft.Json.JavaScriptConvert.Undefined">
+        <member name="F:Newtonsoft.Json.JsonConvert.Undefined">
             <summary>
             Represents JavaScript's undefined as a string. This field is read-only.
             </summary>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.DateTime)">
+        <member name="F:Newtonsoft.Json.JsonConvert.PositiveInfinity">
+            <summary>
+            Represents JavaScript's positive infinity as a string. This field is read-only.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonConvert.NegativeInfinity">
+            <summary>
+            Represents JavaScript's negative infinity as a string. This field is read-only.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonConvert.NaN">
+            <summary>
+            Represents JavaScript's NaN as a string. This field is read-only.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.DateTime)">
             <summary>
-            Converts the <see cref="T:System.DateTime"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.DateTime"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.DateTime"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.DateTime"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.Boolean)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.Boolean)">
             <summary>
-            Converts the <see cref="T:System.Boolean"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.Boolean"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.Boolean"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.Boolean"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.Char)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.Char)">
             <summary>
-            Converts the <see cref="T:System.Char"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.Char"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.Char"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.Char"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.Enum)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.Enum)">
             <summary>
-            Converts the <see cref="T:System.Enum"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.Enum"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.Enum"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.Enum"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.Int32)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.Int32)">
             <summary>
-            Converts the <see cref="T:System.Int32"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.Int32"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.Int32"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.Int32"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.Int16)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.Int16)">
             <summary>
-            Converts the <see cref="T:System.Int16"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.Int16"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.Int16"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.Int16"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.UInt16)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.UInt16)">
             <summary>
-            Converts the <see cref="T:System.UInt16"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.UInt16"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.UInt16"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.UInt16"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.UInt32)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.UInt32)">
             <summary>
-            Converts the <see cref="T:System.UInt32"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.UInt32"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.UInt32"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.UInt32"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.Int64)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.Int64)">
             <summary>
-            Converts the <see cref="T:System.Int64"/>  to it's JavaScript string representation.
+            Converts the <see cref="T:System.Int64"/>  to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.Int64"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.Int64"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.UInt64)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.UInt64)">
             <summary>
-            Converts the <see cref="T:System.UInt64"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.UInt64"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.UInt64"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.UInt64"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.Single)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.Single)">
             <summary>
-            Converts the <see cref="T:System.Single"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.Single"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.Single"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.Single"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.Double)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.Double)">
             <summary>
-            Converts the <see cref="T:System.Double"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.Double"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.Double"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.Double"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.Byte)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.Byte)">
             <summary>
-            Converts the <see cref="T:System.Byte"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.Byte"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.Byte"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.Byte"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.SByte)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.SByte)">
             <summary>
-            Converts the <see cref="T:System.SByte"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.SByte"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.SByte"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.SByte"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.Decimal)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.Decimal)">
             <summary>
-            Converts the <see cref="T:System.Decimal"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.Decimal"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.SByte"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.SByte"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.Guid)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.Guid)">
             <summary>
-            Converts the <see cref="T:System.Guid"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.Guid"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.Guid"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.Guid"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.String)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.String)">
             <summary>
-            Converts the <see cref="T:System.String"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.String"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.String"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.String"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.String,System.Char)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.String,System.Char)">
             <summary>
-            Converts the <see cref="T:System.String"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.String"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
             <param name="delimter">The string delimiter character.</param>
-            <returns>A Json string representation of the <see cref="T:System.String"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.String"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.ToString(System.Object)">
+        <member name="M:Newtonsoft.Json.JsonConvert.ToString(System.Object)">
             <summary>
-            Converts the <see cref="T:System.Object"/> to it's JavaScript string representation.
+            Converts the <see cref="T:System.Object"/> to its JSON string representation.
             </summary>
             <param name="value">The value to convert.</param>
-            <returns>A Json string representation of the <see cref="T:System.Object"/>.</returns>
+            <returns>A JSON string representation of the <see cref="T:System.Object"/>.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.SerializeObject(System.Object)">
+        <member name="M:Newtonsoft.Json.JsonConvert.SerializeObject(System.Object)">
             <summary>
-            Serializes the specified object to a Json object.
+            Serializes the specified object to a JSON string.
             </summary>
             <param name="value">The object to serialize.</param>
-            <returns>A Json string representation of the object.</returns>
+            <returns>A JSON string representation of the object.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.DeserializeObject(System.String)">
+        <member name="M:Newtonsoft.Json.JsonConvert.SerializeObject(System.Object,Newtonsoft.Json.Formatting)">
+            <summary>
+            Serializes the specified object to a JSON string.
+            </summary>
+            <param name="value">The object to serialize.</param>
+            <param name="formatting">Indicates how the output is formatted.</param>
+            <returns>
+            A JSON string representation of the object.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConvert.SerializeObject(System.Object,Newtonsoft.Json.JsonConverter[])">
+            <summary>
+            Serializes the specified object to a JSON string using a collection of <see cref="T:Newtonsoft.Json.JsonConverter"/>.
+            </summary>
+            <param name="value">The object to serialize.</param>
+            <param name="converters">A collection converters used while serializing.</param>
+            <returns>A JSON string representation of the object.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConvert.SerializeObject(System.Object,Newtonsoft.Json.Formatting,Newtonsoft.Json.JsonConverter[])">
+            <summary>
+            Serializes the specified object to a JSON string using a collection of <see cref="T:Newtonsoft.Json.JsonConverter"/>.
+            </summary>
+            <param name="value">The object to serialize.</param>
+            <param name="formatting">Indicates how the output is formatted.</param>
+            <param name="converters">A collection converters used while serializing.</param>
+            <returns>A JSON string representation of the object.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConvert.SerializeObject(System.Object,Newtonsoft.Json.Formatting,Newtonsoft.Json.JsonSerializerSettings)">
+            <summary>
+            Serializes the specified object to a JSON string using a collection of <see cref="T:Newtonsoft.Json.JsonConverter"/>.
+            </summary>
+            <param name="value">The object to serialize.</param>
+            <param name="formatting">Indicates how the output is formatted.</param>
+            <param name="settings">The <see cref="T:Newtonsoft.Json.JsonSerializerSettings"/> used to serialize the object.
+            If this is null, default serialization settings will be is used.</param>
+            <returns>
+            A JSON string representation of the object.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConvert.DeserializeObject(System.String)">
             <summary>
             Deserializes the specified object to a Json object.
             </summary>
             <param name="value">The object to deserialize.</param>
             <returns>The deserialized object from the Json string.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.DeserializeObject(System.String,System.Type)">
+        <member name="M:Newtonsoft.Json.JsonConvert.DeserializeObject(System.String,System.Type)">
             <summary>
             Deserializes the specified object to a Json object.
             </summary>
@@ -448,7 +3124,7 @@
             <param name="type">The <see cref="T:System.Type"/> of object being deserialized.</param>
             <returns>The deserialized object from the Json string.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.DeserializeObject``1(System.String)">
+        <member name="M:Newtonsoft.Json.JsonConvert.DeserializeObject``1(System.String)">
             <summary>
             Deserializes the specified object to a Json object.
             </summary>
@@ -456,14 +3132,100 @@
             <param name="value">The object to deserialize.</param>
             <returns>The deserialized object from the Json string.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptConvert.DeserializeObject``1(System.String,Newtonsoft.Json.JsonConverter[])">
+        <member name="M:Newtonsoft.Json.JsonConvert.DeserializeAnonymousType``1(System.String,``0)">
             <summary>
-            Deserializes the specified object to a Json object.
+            Deserializes the specified JSON to the given anonymous type.
+            </summary>
+            <typeparam name="T">
+            The anonymous type to deserialize to. This can't be specified
+            traditionally and must be infered from the anonymous type passed
+            as a parameter.
+            </typeparam>
+            <param name="value">The object to deserialize.</param>
+            <param name="anonymousTypeObject">The anonymous type object.</param>
+            <returns>The deserialized anonymous type from the JSON string.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConvert.DeserializeObject``1(System.String,Newtonsoft.Json.JsonConverter[])">
+            <summary>
+            Deserializes the JSON string to the specified type.
             </summary>
             <typeparam name="T">The type of the object to deserialize.</typeparam>
             <param name="value">The object to deserialize.</param>
             <param name="converters">Converters to use while deserializing.</param>
-            <returns>The deserialized object from the Json string.</returns>
+            <returns>The deserialized object from the JSON string.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConvert.DeserializeObject``1(System.String,Newtonsoft.Json.JsonSerializerSettings)">
+            <summary>
+            Deserializes the JSON string to the specified type.
+            </summary>
+            <typeparam name="T">The type of the object to deserialize.</typeparam>
+            <param name="value">The object to deserialize.</param>
+            <param name="settings">
+            The <see cref="T:Newtonsoft.Json.JsonSerializerSettings"/> used to deserialize the object.
+            If this is null, default serialization settings will be is used.
+            </param>
+            <returns>The deserialized object from the JSON string.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConvert.DeserializeObject(System.String,System.Type,Newtonsoft.Json.JsonConverter[])">
+            <summary>
+            Deserializes the JSON string to the specified type.
+            </summary>
+            <param name="value">The object to deserialize.</param>
+            <param name="type">The type of the object to deserialize.</param>
+            <param name="converters">Converters to use while deserializing.</param>
+            <returns>The deserialized object from the JSON string.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConvert.DeserializeObject(System.String,System.Type,Newtonsoft.Json.JsonSerializerSettings)">
+            <summary>
+            Deserializes the JSON string to the specified type.
+            </summary>
+            <param name="value">The JSON to deserialize.</param>
+            <param name="type">The type of the object to deserialize.</param>
+            <param name="settings">
+            The <see cref="T:Newtonsoft.Json.JsonSerializerSettings"/> used to deserialize the object.
+            If this is null, default serialization settings will be is used.
+            </param>
+            <returns>The deserialized object from the JSON string.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConvert.PopulateObject(System.String,System.Object)">
+            <summary>
+            Populates the object with values from the JSON string.
+            </summary>
+            <param name="value">The JSON to populate values from.</param>
+            <param name="target">The target object to populate values onto.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConvert.PopulateObject(System.String,System.Object,Newtonsoft.Json.JsonSerializerSettings)">
+            <summary>
+            Populates the object with values from the JSON string.
+            </summary>
+            <param name="value">The JSON to populate values from.</param>
+            <param name="target">The target object to populate values onto.</param>
+            <param name="settings">
+            The <see cref="T:Newtonsoft.Json.JsonSerializerSettings"/> used to deserialize the object.
+            If this is null, default serialization settings will be is used.
+            </param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConvert.SerializeXmlNode(System.Xml.XmlNode)">
+            <summary>
+            Serializes the XML node to a JSON string.
+            </summary>
+            <param name="node">The node to serialize.</param>
+            <returns>A JSON string of the XmlNode.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConvert.DeserializeXmlNode(System.String)">
+            <summary>
+            Deserializes the XmlNode from a JSON string.
+            </summary>
+            <param name="value">The JSON string.</param>
+            <returns>The deserialized XmlNode</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonConvert.DeserializeXmlNode(System.String,System.String)">
+            <summary>
+            Deserializes the XmlNode from a JSON string nested in a root elment.
+            </summary>
+            <param name="value">The JSON string.</param>
+            <param name="deserializeRootElementName">The name of the root element to append when deserializing.</param>
+            <returns>The deserialized XmlNode</returns>
         </member>
         <member name="T:Newtonsoft.Json.JsonSerializationException">
             <summary>
@@ -490,501 +3252,2576 @@
             <param name="message">The error message that explains the reason for the exception.</param>
             <param name="innerException">The exception that is the cause of the current exception, or a null reference (Nothing in Visual Basic) if no inner exception is specified.</param>
         </member>
-        <member name="T:Newtonsoft.Json.JsonWriterException">
+        <member name="T:Newtonsoft.Json.JsonSerializer">
             <summary>
-            The exception thrown when an error occurs while reading Json text.
+            Serializes and deserializes objects into and from the JSON format.
+            The <see cref="T:Newtonsoft.Json.JsonSerializer"/> enables you to control how objects are encoded into JSON.
             </summary>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriterException.#ctor">
+        <member name="M:Newtonsoft.Json.JsonSerializer.#ctor">
             <summary>
-            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonWriterException"/> class.
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonSerializer"/> class.
             </summary>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriterException.#ctor(System.String)">
+        <member name="M:Newtonsoft.Json.JsonSerializer.Create(Newtonsoft.Json.JsonSerializerSettings)">
             <summary>
-            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonWriterException"/> class
+            Creates a new <see cref="T:Newtonsoft.Json.JsonSerializer"/> instance using the specified <see cref="T:Newtonsoft.Json.JsonSerializerSettings"/>.
+            </summary>
+            <param name="settings">The settings to be applied to the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.</param>
+            <returns>A new <see cref="T:Newtonsoft.Json.JsonSerializer"/> instance using the specified <see cref="T:Newtonsoft.Json.JsonSerializerSettings"/>.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonSerializer.Populate(System.IO.TextReader,System.Object)">
+            <summary>
+            Populates the JSON values onto the target object.
+            </summary>
+            <param name="reader">The <see cref="T:System.IO.TextReader"/> that contains the JSON structure to reader values from.</param>
+            <param name="target">The target object to populate values onto.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonSerializer.Populate(Newtonsoft.Json.JsonReader,System.Object)">
+            <summary>
+            Populates the JSON values onto the target object.
+            </summary>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> that contains the JSON structure to reader values from.</param>
+            <param name="target">The target object to populate values onto.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonSerializer.Deserialize(Newtonsoft.Json.JsonReader)">
+            <summary>
+            Deserializes the Json structure contained by the specified <see cref="T:Newtonsoft.Json.JsonReader"/>.
+            </summary>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> that contains the JSON structure to deserialize.</param>
+            <returns>The <see cref="T:System.Object"/> being deserialized.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonSerializer.Deserialize(System.IO.TextReader,System.Type)">
+            <summary>
+            Deserializes the Json structure contained by the specified <see cref="T:System.IO.StringReader"/>
+            into an instance of the specified type.
+            </summary>
+            <param name="reader">The <see cref="T:System.IO.TextReader"/> containing the object.</param>
+            <param name="objectType">The <see cref="T:System.Type"/> of object being deserialized.</param>
+            <returns>The instance of <paramref name="objectType"/> being deserialized.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonSerializer.Deserialize``1(Newtonsoft.Json.JsonReader)">
+            <summary>
+            Deserializes the Json structure contained by the specified <see cref="T:Newtonsoft.Json.JsonReader"/>
+            into an instance of the specified type.
+            </summary>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> containing the object.</param>
+            <typeparam name="T">The type of the object to deserialize.</typeparam>
+            <returns>The instance of <typeparamref name="T"/> being deserialized.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonSerializer.Deserialize(Newtonsoft.Json.JsonReader,System.Type)">
+            <summary>
+            Deserializes the Json structure contained by the specified <see cref="T:Newtonsoft.Json.JsonReader"/>
+            into an instance of the specified type.
+            </summary>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> containing the object.</param>
+            <param name="objectType">The <see cref="T:System.Type"/> of object being deserialized.</param>
+            <returns>The instance of <paramref name="objectType"/> being deserialized.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonSerializer.Serialize(System.IO.TextWriter,System.Object)">
+            <summary>
+            Serializes the specified <see cref="T:System.Object"/> and writes the Json structure
+            to a <c>Stream</c> using the specified <see cref="T:System.IO.TextWriter"/>. 
+            </summary>
+            <param name="textWriter">The <see cref="T:System.IO.TextWriter"/> used to write the Json structure.</param>
+            <param name="value">The <see cref="T:System.Object"/> to serialize.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonSerializer.Serialize(Newtonsoft.Json.JsonWriter,System.Object)">
+            <summary>
+            Serializes the specified <see cref="T:System.Object"/> and writes the Json structure
+            to a <c>Stream</c> using the specified <see cref="T:Newtonsoft.Json.JsonWriter"/>. 
+            </summary>
+            <param name="jsonWriter">The <see cref="T:Newtonsoft.Json.JsonWriter"/> used to write the Json structure.</param>
+            <param name="value">The <see cref="T:System.Object"/> to serialize.</param>
+        </member>
+        <member name="E:Newtonsoft.Json.JsonSerializer.Error">
+            <summary>
+            Occurs when the <see cref="T:Newtonsoft.Json.JsonSerializer"/> errors during serialization and deserialization.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializer.ReferenceResolver">
+            <summary>
+            Gets or sets the <see cref="T:Newtonsoft.Json.Serialization.IReferenceResolver"/> used by the serializer when resolving references.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializer.Binder">
+            <summary>
+            Gets or sets the <see cref="T:System.Runtime.Serialization.SerializationBinder"/> used by the serializer when resolving type names.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializer.TypeNameHandling">
+            <summary>
+            Gets or sets how type name writing and reading is handled by the serializer.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializer.PreserveReferencesHandling">
+            <summary>
+            Gets or sets how object references are preserved by the serializer.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializer.ReferenceLoopHandling">
+            <summary>
+            Get or set how reference loops (e.g. a class referencing itself) is handled.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializer.MissingMemberHandling">
+            <summary>
+            Get or set how missing members (e.g. JSON contains a property that isn't a member on the object) are handled during deserialization.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializer.NullValueHandling">
+            <summary>
+            Get or set how null values are handled during serialization and deserialization.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializer.DefaultValueHandling">
+            <summary>
+            Get or set how null default are handled during serialization and deserialization.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializer.ObjectCreationHandling">
+            <summary>
+            Gets or sets how objects are created during deserialization.
+            </summary>
+            <value>The object creation handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializer.ConstructorHandling">
+            <summary>
+            Gets or sets how constructors are used during deserialization.
+            </summary>
+            <value>The constructor handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializer.Converters">
+            <summary>
+            Gets a collection <see cref="T:Newtonsoft.Json.JsonConverter"/> that will be used during serialization.
+            </summary>
+            <value>Collection <see cref="T:Newtonsoft.Json.JsonConverter"/> that will be used during serialization.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializer.ContractResolver">
+            <summary>
+            Gets or sets the contract resolver used by the serializer when
+            serializing .NET objects to JSON and vice versa.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.JsonSerializer.Context">
+            <summary>
+            Gets or sets the <see cref="T:System.Runtime.Serialization.StreamingContext"/> used by the serializer when invoking serialization callback methods.
+            </summary>
+            <value>The context.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.Linq.Extensions">
+            <summary>
+            Contains the LINQ to JSON extension methods.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.Extensions.Ancestors``1(System.Collections.Generic.IEnumerable{``0})">
+            <summary>
+            Returns a collection of tokens that contains the ancestors of every token in the source collection.
+            </summary>
+            <typeparam name="T">The type of the objects in source, constrained to <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</typeparam>
+            <param name="source">An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the source collection.</param>
+            <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the ancestors of every node in the source collection.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.Extensions.Descendants``1(System.Collections.Generic.IEnumerable{``0})">
+            <summary>
+            Returns a collection of tokens that contains the descendants of every token in the source collection.
+            </summary>
+            <typeparam name="T">The type of the objects in source, constrained to <see cref="T:Newtonsoft.Json.Linq.JContainer"/>.</typeparam>
+            <param name="source">An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the source collection.</param>
+            <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the descendants of every node in the source collection.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.Extensions.Properties(System.Collections.Generic.IEnumerable{Newtonsoft.Json.Linq.JObject})">
+            <summary>
+            Returns a collection of child properties of every object in the source collection.
+            </summary>
+            <param name="source">An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JObject"/> that contains the source collection.</param>
+            <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JProperty"/> that contains the properties of every object in the source collection.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.Extensions.Values(System.Collections.Generic.IEnumerable{Newtonsoft.Json.Linq.JToken},System.Object)">
+            <summary>
+            Returns a collection of child values of every object in the source collection with the given key.
+            </summary>
+            <param name="source">An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the source collection.</param>
+            <param name="key">The token key.</param>
+            <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the values of every node in the source collection with the given key.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.Extensions.Values(System.Collections.Generic.IEnumerable{Newtonsoft.Json.Linq.JToken})">
+            <summary>
+            Returns a collection of child values of every object in the source collection.
+            </summary>
+            <param name="source">An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the source collection.</param>
+            <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the values of every node in the source collection.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.Extensions.Values``1(System.Collections.Generic.IEnumerable{Newtonsoft.Json.Linq.JToken},System.Object)">
+            <summary>
+            Returns a collection of converted child values of every object in the source collection with the given key.
+            </summary>
+            <typeparam name="U">The type to convert the values to.</typeparam>
+            <param name="source">An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the source collection.</param>
+            <param name="key">The token key.</param>
+            <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> that contains the converted values of every node in the source collection with the given key.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.Extensions.Values``1(System.Collections.Generic.IEnumerable{Newtonsoft.Json.Linq.JToken})">
+            <summary>
+            Returns a collection of converted child values of every object in the source collection.
+            </summary>
+            <typeparam name="U">The type to convert the values to.</typeparam>
+            <param name="source">An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the source collection.</param>
+            <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> that contains the converted values of every node in the source collection.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.Extensions.Value``1(System.Collections.Generic.IEnumerable{Newtonsoft.Json.Linq.JToken})">
+            <summary>
+            Converts the value.
+            </summary>
+            <typeparam name="U">The type to convert the value to.</typeparam>
+            <param name="value">A <see cref="T:Newtonsoft.Json.Linq.JToken"/> cast as a <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</param>
+            <returns>A converted value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.Extensions.Value``2(System.Collections.Generic.IEnumerable{``0})">
+            <summary>
+            Converts the value.
+            </summary>
+            <typeparam name="T">The source collection type.</typeparam>
+            <typeparam name="U">The type to convert the value to.</typeparam>
+            <param name="value">A <see cref="T:Newtonsoft.Json.Linq.JToken"/> cast as a <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</param>
+            <returns>A converted value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.Extensions.Children``1(System.Collections.Generic.IEnumerable{``0})">
+            <summary>
+            Returns a collection of child tokens of every array in the source collection.
+            </summary>
+            <typeparam name="T">The source collection type.</typeparam>
+            <param name="source">An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the source collection.</param>
+            <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the values of every node in the source collection.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.Extensions.Children``2(System.Collections.Generic.IEnumerable{``0})">
+            <summary>
+            Returns a collection of converted child tokens of every array in the source collection.
+            </summary>
+            <param name="source">An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the source collection.</param>
+            <typeparam name="U">The type to convert the values to.</typeparam>
+            <typeparam name="T">The source collection type.</typeparam>
+            <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> that contains the converted values of every node in the source collection.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.Extensions.AsJEnumerable(System.Collections.Generic.IEnumerable{Newtonsoft.Json.Linq.JToken})">
+            <summary>
+            Returns the input typed as <see cref="T:Newtonsoft.Json.Linq.IJEnumerable`1"/>.
+            </summary>
+            <param name="source">An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the source collection.</param>
+            <returns>The input typed as <see cref="T:Newtonsoft.Json.Linq.IJEnumerable`1"/>.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.Extensions.AsJEnumerable``1(System.Collections.Generic.IEnumerable{``0})">
+            <summary>
+            Returns the input typed as <see cref="T:Newtonsoft.Json.Linq.IJEnumerable`1"/>.
+            </summary>
+            <typeparam name="T">The source collection type.</typeparam>
+            <param name="source">An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the source collection.</param>
+            <returns>The input typed as <see cref="T:Newtonsoft.Json.Linq.IJEnumerable`1"/>.</returns>
+        </member>
+        <member name="T:Newtonsoft.Json.Linq.JConstructor">
+            <summary>
+            Represents a JSON constructor.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Linq.JContainer">
+            <summary>
+            Represents a token that can contain other tokens.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JContainer.OnAddingNew(System.ComponentModel.AddingNewEventArgs)">
+            <summary>
+            Raises the <see cref="E:Newtonsoft.Json.Linq.JContainer.AddingNew"/> event.
+            </summary>
+            <param name="e">The <see cref="T:System.ComponentModel.AddingNewEventArgs"/> instance containing the event data.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JContainer.OnListChanged(System.ComponentModel.ListChangedEventArgs)">
+            <summary>
+            Raises the <see cref="E:Newtonsoft.Json.Linq.JContainer.ListChanged"/> event.
+            </summary>
+            <param name="e">The <see cref="T:System.ComponentModel.ListChangedEventArgs"/> instance containing the event data.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JContainer.Children">
+            <summary>
+            Returns a collection of the child tokens of this token, in document order.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> containing the child tokens of this <see cref="T:Newtonsoft.Json.Linq.JToken"/>, in document order.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JContainer.Values``1">
+            <summary>
+            Returns a collection of the child values of this token, in document order.
+            </summary>
+            <typeparam name="T">The type to convert the values to.</typeparam>
+            <returns>
+            A <see cref="T:System.Collections.Generic.IEnumerable`1"/> containing the child values of this <see cref="T:Newtonsoft.Json.Linq.JToken"/>, in document order.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JContainer.Descendants">
+            <summary>
+            Returns a collection of the descendant tokens for this token in document order.
+            </summary>
+            <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> containing the descendant tokens of the <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JContainer.Add(System.Object)">
+            <summary>
+            Adds the specified content as children of this <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="content">The content to be added.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JContainer.AddFirst(System.Object)">
+            <summary>
+            Adds the specified content as the first children of this <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="content">The content to be added.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JContainer.CreateWriter">
+            <summary>
+            Creates an <see cref="T:Newtonsoft.Json.JsonWriter"/> that can be used to add tokens to the <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <returns>An <see cref="T:Newtonsoft.Json.JsonWriter"/> that is ready to have content written to it.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JContainer.ReplaceAll(System.Object)">
+            <summary>
+            Replaces the children nodes of this token with the specified content.
+            </summary>
+            <param name="content">The content.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JContainer.RemoveAll">
+            <summary>
+            Removes the child nodes from this token.
+            </summary>
+        </member>
+        <member name="E:Newtonsoft.Json.Linq.JContainer.ListChanged">
+            <summary>
+            Occurs when the list changes or an item in the list changes.
+            </summary>
+        </member>
+        <member name="E:Newtonsoft.Json.Linq.JContainer.AddingNew">
+            <summary>
+            Occurs before an item is added to the collection.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JContainer.HasValues">
+            <summary>
+            Gets a value indicating whether this token has childen tokens.
+            </summary>
+            <value>
+                <c>true</c> if this token has child values; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JContainer.First">
+            <summary>
+            Get the first child token of this token.
+            </summary>
+            <value>
+            A <see cref="T:Newtonsoft.Json.Linq.JToken"/> containing the first child token of the <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JContainer.Last">
+            <summary>
+            Get the last child token of this token.
+            </summary>
+            <value>
+            A <see cref="T:Newtonsoft.Json.Linq.JToken"/> containing the last child token of the <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </value>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JConstructor.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JConstructor"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JConstructor.#ctor(Newtonsoft.Json.Linq.JConstructor)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JConstructor"/> class from another <see cref="T:Newtonsoft.Json.Linq.JConstructor"/> object.
+            </summary>
+            <param name="other">A <see cref="T:Newtonsoft.Json.Linq.JConstructor"/> object to copy from.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JConstructor.#ctor(System.String,System.Object[])">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JConstructor"/> class with the specified name and content.
+            </summary>
+            <param name="name">The constructor name.</param>
+            <param name="content">The contents of the constructor.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JConstructor.#ctor(System.String,System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JConstructor"/> class with the specified name and content.
+            </summary>
+            <param name="name">The constructor name.</param>
+            <param name="content">The contents of the constructor.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JConstructor.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JConstructor"/> class with the specified name.
+            </summary>
+            <param name="name">The constructor name.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JConstructor.WriteTo(Newtonsoft.Json.JsonWriter,Newtonsoft.Json.JsonConverter[])">
+            <summary>
+            Writes this token to a <see cref="T:Newtonsoft.Json.JsonWriter"/>.
+            </summary>
+            <param name="writer">A <see cref="T:Newtonsoft.Json.JsonWriter"/> into which this method will write.</param>
+            <param name="converters">A collection of <see cref="T:Newtonsoft.Json.JsonConverter"/> which will be used when writing the token.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JConstructor.Load(Newtonsoft.Json.JsonReader)">
+            <summary>
+            Loads an <see cref="T:Newtonsoft.Json.Linq.JConstructor"/> from a <see cref="T:Newtonsoft.Json.JsonReader"/>. 
+            </summary>
+            <param name="reader">A <see cref="T:Newtonsoft.Json.JsonReader"/> that will be read for the content of the <see cref="T:Newtonsoft.Json.Linq.JConstructor"/>.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JConstructor"/> that contains the JSON that was read from the specified <see cref="T:Newtonsoft.Json.JsonReader"/>.</returns>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JConstructor.Name">
+            <summary>
+            Gets or sets the name of this constructor.
+            </summary>
+            <value>The constructor name.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JConstructor.Type">
+            <summary>
+            Gets the node type for this <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <value>The type.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JConstructor.Item(System.Object)">
+            <summary>
+            Gets the <see cref="T:Newtonsoft.Json.Linq.JToken"/> with the specified key.
+            </summary>
+            <value>The <see cref="T:Newtonsoft.Json.Linq.JToken"/> with the specified key.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.Linq.JEnumerable`1">
+            <summary>
+            Represents a collection of <see cref="T:Newtonsoft.Json.Linq.JToken"/> objects.
+            </summary>
+            <typeparam name="T">The type of token</typeparam>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JEnumerable`1.Empty">
+            <summary>
+            An empty collection of <see cref="T:Newtonsoft.Json.Linq.JToken"/> objects.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JEnumerable`1.#ctor(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JEnumerable`1"/> struct.
+            </summary>
+            <param name="enumerable">The enumerable.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JEnumerable`1.GetEnumerator">
+            <summary>
+            Returns an enumerator that iterates through the collection.
+            </summary>
+            <returns>
+            A <see cref="T:System.Collections.Generic.IEnumerator`1"/> that can be used to iterate through the collection.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JEnumerable`1.System#Collections#IEnumerable#GetEnumerator">
+            <summary>
+            Returns an enumerator that iterates through a collection.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"/> object that can be used to iterate through the collection.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JEnumerable`1.Equals(System.Object)">
+            <summary>
+            Determines whether the specified <see cref="T:System.Object"/> is equal to this instance.
+            </summary>
+            <param name="obj">The <see cref="T:System.Object"/> to compare with this instance.</param>
+            <returns>
+                <c>true</c> if the specified <see cref="T:System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JEnumerable`1.GetHashCode">
+            <summary>
+            Returns a hash code for this instance.
+            </summary>
+            <returns>
+            A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
+            </returns>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JEnumerable`1.Item(System.Object)">
+            <summary>
+            Gets the <see cref="T:Newtonsoft.Json.Linq.IJEnumerable`1"/> with the specified key.
+            </summary>
+            <value></value>
+        </member>
+        <member name="T:Newtonsoft.Json.Linq.JObject">
+            <summary>
+            Represents a JSON object.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JObject"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.#ctor(Newtonsoft.Json.Linq.JObject)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JObject"/> class from another <see cref="T:Newtonsoft.Json.Linq.JObject"/> object.
+            </summary>
+            <param name="other">A <see cref="T:Newtonsoft.Json.Linq.JObject"/> object to copy from.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.#ctor(System.Object[])">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JObject"/> class with the specified content.
+            </summary>
+            <param name="content">The contents of the object.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.#ctor(System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JObject"/> class with the specified content.
+            </summary>
+            <param name="content">The contents of the object.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.Properties">
+            <summary>
+            Gets an <see cref="T:System.Collections.Generic.IEnumerable`1"/> of this object's properties.
+            </summary>
+            <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of this object's properties.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.Property(System.String)">
+            <summary>
+            Gets a <see cref="T:Newtonsoft.Json.Linq.JProperty"/> the specified name.
+            </summary>
+            <param name="name">The property name.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JProperty"/> with the specified name or null.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.PropertyValues">
+            <summary>
+            Gets an <see cref="T:Newtonsoft.Json.Linq.JEnumerable`1"/> of this object's property values.
+            </summary>
+            <returns>An <see cref="T:Newtonsoft.Json.Linq.JEnumerable`1"/> of this object's property values.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.Load(Newtonsoft.Json.JsonReader)">
+            <summary>
+            Loads an <see cref="T:Newtonsoft.Json.Linq.JObject"/> from a <see cref="T:Newtonsoft.Json.JsonReader"/>. 
+            </summary>
+            <param name="reader">A <see cref="T:Newtonsoft.Json.JsonReader"/> that will be read for the content of the <see cref="T:Newtonsoft.Json.Linq.JObject"/>.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JObject"/> that contains the JSON that was read from the specified <see cref="T:Newtonsoft.Json.JsonReader"/>.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.Parse(System.String)">
+            <summary>
+            Load a <see cref="T:Newtonsoft.Json.Linq.JObject"/> from a string that contains JSON.
+            </summary>
+            <param name="json">A <see cref="T:System.String"/> that contains JSON.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JObject"/> populated from the string that contains JSON.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.FromObject(System.Object)">
+            <summary>
+            Creates a <see cref="T:Newtonsoft.Json.Linq.JObject"/> from an object.
+            </summary>
+            <param name="o">The object that will be used to create <see cref="T:Newtonsoft.Json.Linq.JObject"/>.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JObject"/> with the values of the specified object</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.FromObject(System.Object,Newtonsoft.Json.JsonSerializer)">
+            <summary>
+            Creates a <see cref="T:Newtonsoft.Json.Linq.JArray"/> from an object.
+            </summary>
+            <param name="o">The object that will be used to create <see cref="T:Newtonsoft.Json.Linq.JArray"/>.</param>
+            <param name="jsonSerializer">The <see cref="T:Newtonsoft.Json.JsonSerializer"/> that will be used to read the object.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JArray"/> with the values of the specified object</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.WriteTo(Newtonsoft.Json.JsonWriter,Newtonsoft.Json.JsonConverter[])">
+            <summary>
+            Writes this token to a <see cref="T:Newtonsoft.Json.JsonWriter"/>.
+            </summary>
+            <param name="writer">A <see cref="T:Newtonsoft.Json.JsonWriter"/> into which this method will write.</param>
+            <param name="converters">A collection of <see cref="T:Newtonsoft.Json.JsonConverter"/> which will be used when writing the token.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.Add(System.String,Newtonsoft.Json.Linq.JToken)">
+            <summary>
+            Adds the specified property name.
+            </summary>
+            <param name="propertyName">Name of the property.</param>
+            <param name="value">The value.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.Remove(System.String)">
+            <summary>
+            Removes the property with the specified name.
+            </summary>
+            <param name="propertyName">Name of the property.</param>
+            <returns>true if item was successfully removed; otherwise, false.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.TryGetValue(System.String,Newtonsoft.Json.Linq.JToken@)">
+            <summary>
+            Tries the get value.
+            </summary>
+            <param name="propertyName">Name of the property.</param>
+            <param name="value">The value.</param>
+            <returns>true if a value was successfully retrieved; otherwise, false.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.GetEnumerator">
+            <summary>
+            Returns an enumerator that iterates through the collection.
+            </summary>
+            <returns>
+            A <see cref="T:System.Collections.Generic.IEnumerator`1"/> that can be used to iterate through the collection.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JObject.OnPropertyChanged(System.String)">
+            <summary>
+            Raises the <see cref="E:Newtonsoft.Json.Linq.JObject.PropertyChanged"/> event with the provided arguments.
+            </summary>
+            <param name="propertyName">Name of the property.</param>
+        </member>
+        <member name="E:Newtonsoft.Json.Linq.JObject.PropertyChanged">
+            <summary>
+            Occurs when a property value changes.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JObject.Type">
+            <summary>
+            Gets the node type for this <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <value>The type.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JObject.Item(System.Object)">
+            <summary>
+            Gets the <see cref="T:Newtonsoft.Json.Linq.JToken"/> with the specified key.
+            </summary>
+            <value>The <see cref="T:Newtonsoft.Json.Linq.JToken"/> with the specified key.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JObject.Item(System.String)">
+            <summary>
+            Gets or sets the <see cref="T:Newtonsoft.Json.Linq.JToken"/> with the specified property name.
+            </summary>
+            <value></value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JObject.Count">
+            <summary>
+            Gets the number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <value></value>
+            <returns>The number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.</returns>
+        </member>
+        <member name="T:Newtonsoft.Json.Linq.JArray">
+            <summary>
+            Represents a JSON array.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JArray"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.#ctor(Newtonsoft.Json.Linq.JArray)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JArray"/> class from another <see cref="T:Newtonsoft.Json.Linq.JArray"/> object.
+            </summary>
+            <param name="other">A <see cref="T:Newtonsoft.Json.Linq.JArray"/> object to copy from.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.#ctor(System.Object[])">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JArray"/> class with the specified content.
+            </summary>
+            <param name="content">The contents of the array.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.#ctor(System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JArray"/> class with the specified content.
+            </summary>
+            <param name="content">The contents of the array.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.Load(Newtonsoft.Json.JsonReader)">
+            <summary>
+            Loads an <see cref="T:Newtonsoft.Json.Linq.JArray"/> from a <see cref="T:Newtonsoft.Json.JsonReader"/>. 
+            </summary>
+            <param name="reader">A <see cref="T:Newtonsoft.Json.JsonReader"/> that will be read for the content of the <see cref="T:Newtonsoft.Json.Linq.JArray"/>.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JArray"/> that contains the JSON that was read from the specified <see cref="T:Newtonsoft.Json.JsonReader"/>.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.Parse(System.String)">
+            <summary>
+            Load a <see cref="T:Newtonsoft.Json.Linq.JArray"/> from a string that contains JSON.
+            </summary>
+            <param name="json">A <see cref="T:System.String"/> that contains JSON.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JArray"/> populated from the string that contains JSON.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.FromObject(System.Object)">
+            <summary>
+            Creates a <see cref="T:Newtonsoft.Json.Linq.JArray"/> from an object.
+            </summary>
+            <param name="o">The object that will be used to create <see cref="T:Newtonsoft.Json.Linq.JArray"/>.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JArray"/> with the values of the specified object</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.FromObject(System.Object,Newtonsoft.Json.JsonSerializer)">
+            <summary>
+            Creates a <see cref="T:Newtonsoft.Json.Linq.JArray"/> from an object.
+            </summary>
+            <param name="o">The object that will be used to create <see cref="T:Newtonsoft.Json.Linq.JArray"/>.</param>
+            <param name="jsonSerializer">The <see cref="T:Newtonsoft.Json.JsonSerializer"/> that will be used to read the object.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JArray"/> with the values of the specified object</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.WriteTo(Newtonsoft.Json.JsonWriter,Newtonsoft.Json.JsonConverter[])">
+            <summary>
+            Writes this token to a <see cref="T:Newtonsoft.Json.JsonWriter"/>.
+            </summary>
+            <param name="writer">A <see cref="T:Newtonsoft.Json.JsonWriter"/> into which this method will write.</param>
+            <param name="converters">A collection of <see cref="T:Newtonsoft.Json.JsonConverter"/> which will be used when writing the token.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.IndexOf(Newtonsoft.Json.Linq.JToken)">
+            <summary>
+            Determines the index of a specific item in the <see cref="T:System.Collections.Generic.IList`1"/>.
+            </summary>
+            <param name="item">The object to locate in the <see cref="T:System.Collections.Generic.IList`1"/>.</param>
+            <returns>
+            The index of <paramref name="item"/> if found in the list; otherwise, -1.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.Insert(System.Int32,Newtonsoft.Json.Linq.JToken)">
+            <summary>
+            Inserts an item to the <see cref="T:System.Collections.Generic.IList`1"/> at the specified index.
+            </summary>
+            <param name="index">The zero-based index at which <paramref name="item"/> should be inserted.</param>
+            <param name="item">The object to insert into the <see cref="T:System.Collections.Generic.IList`1"/>.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+                <paramref name="index"/> is not a valid index in the <see cref="T:System.Collections.Generic.IList`1"/>.</exception>
+            <exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.IList`1"/> is read-only.</exception>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.RemoveAt(System.Int32)">
+            <summary>
+            Removes the <see cref="T:System.Collections.Generic.IList`1"/> item at the specified index.
+            </summary>
+            <param name="index">The zero-based index of the item to remove.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+                <paramref name="index"/> is not a valid index in the <see cref="T:System.Collections.Generic.IList`1"/>.</exception>
+            <exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.IList`1"/> is read-only.</exception>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.Add(Newtonsoft.Json.Linq.JToken)">
+            <summary>
+            Adds an item to the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <param name="item">The object to add to the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param>
+            <exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.</exception>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.Clear">
+            <summary>
+            Removes all items from the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only. </exception>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.Contains(Newtonsoft.Json.Linq.JToken)">
+            <summary>
+            Determines whether the <see cref="T:System.Collections.Generic.ICollection`1"/> contains a specific value.
+            </summary>
+            <param name="item">The object to locate in the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param>
+            <returns>
+            true if <paramref name="item"/> is found in the <see cref="T:System.Collections.Generic.ICollection`1"/>; otherwise, false.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JArray.Remove(Newtonsoft.Json.Linq.JToken)">
+            <summary>
+            Removes the first occurrence of a specific object from the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <param name="item">The object to remove from the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param>
+            <returns>
+            true if <paramref name="item"/> was successfully removed from the <see cref="T:System.Collections.Generic.ICollection`1"/>; otherwise, false. This method also returns false if <paramref name="item"/> is not found in the original <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </returns>
+            <exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.</exception>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JArray.Type">
+            <summary>
+            Gets the node type for this <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <value>The type.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JArray.Item(System.Object)">
+            <summary>
+            Gets the <see cref="T:Newtonsoft.Json.Linq.JToken"/> with the specified key.
+            </summary>
+            <value>The <see cref="T:Newtonsoft.Json.Linq.JToken"/> with the specified key.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JArray.Item(System.Int32)">
+            <summary>
+            Gets or sets the <see cref="T:Newtonsoft.Json.Linq.JToken"/> at the specified index.
+            </summary>
+            <value></value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JArray.Count">
+            <summary>
+            Gets the number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <value></value>
+            <returns>The number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.</returns>
+        </member>
+        <member name="T:Newtonsoft.Json.Linq.JTokenReader">
+            <summary>
+            Represents a reader that provides fast, non-cached, forward-only access to serialized Json data.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenReader.#ctor(Newtonsoft.Json.Linq.JToken)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JTokenReader"/> class.
+            </summary>
+            <param name="token">The token to read from.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsBytes">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:Byte[]"/>.
+            </summary>
+            <returns>
+            A <see cref="T:Byte[]"/> or a null reference if the next JSON token is null.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JTokenReader.Read">
+            <summary>
+            Reads the next JSON token from the stream.
+            </summary>
+            <returns>
+            true if the next token was read successfully; false if there are no more tokens to read.
+            </returns>
+        </member>
+        <member name="T:Newtonsoft.Json.Linq.JProperty">
+            <summary>
+            Represents a JSON property.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JProperty.#ctor(Newtonsoft.Json.Linq.JProperty)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JProperty"/> class from another <see cref="T:Newtonsoft.Json.Linq.JProperty"/> object.
+            </summary>
+            <param name="other">A <see cref="T:Newtonsoft.Json.Linq.JProperty"/> object to copy from.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JProperty.Children">
+            <summary>
+            Returns a collection of the child tokens of this token, in document order.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> containing the child tokens of this <see cref="T:Newtonsoft.Json.Linq.JToken"/>, in document order.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JProperty.#ctor(System.String,System.Object[])">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JProperty"/> class.
+            </summary>
+            <param name="name">The property name.</param>
+            <param name="content">The property content.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JProperty.#ctor(System.String,System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JProperty"/> class.
+            </summary>
+            <param name="name">The property name.</param>
+            <param name="content">The property content.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JProperty.WriteTo(Newtonsoft.Json.JsonWriter,Newtonsoft.Json.JsonConverter[])">
+            <summary>
+            Writes this token to a <see cref="T:Newtonsoft.Json.JsonWriter"/>.
+            </summary>
+            <param name="writer">A <see cref="T:Newtonsoft.Json.JsonWriter"/> into which this method will write.</param>
+            <param name="converters">A collection of <see cref="T:Newtonsoft.Json.JsonConverter"/> which will be used when writing the token.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JProperty.Load(Newtonsoft.Json.JsonReader)">
+            <summary>
+            Loads an <see cref="T:Newtonsoft.Json.Linq.JProperty"/> from a <see cref="T:Newtonsoft.Json.JsonReader"/>. 
+            </summary>
+            <param name="reader">A <see cref="T:Newtonsoft.Json.JsonReader"/> that will be read for the content of the <see cref="T:Newtonsoft.Json.Linq.JProperty"/>.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JProperty"/> that contains the JSON that was read from the specified <see cref="T:Newtonsoft.Json.JsonReader"/>.</returns>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JProperty.Name">
+            <summary>
+            Gets the property name.
+            </summary>
+            <value>The property name.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JProperty.Value">
+            <summary>
+            Gets or sets the property value.
+            </summary>
+            <value>The property value.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JProperty.Type">
+            <summary>
+            Gets the node type for this <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <value>The type.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.Linq.JTokenType">
+            <summary>
+            Specifies the type of token.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JTokenType.None">
+            <summary>
+            No token type has been set.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JTokenType.Object">
+            <summary>
+            A JSON object.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JTokenType.Array">
+            <summary>
+            A JSON array.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JTokenType.Constructor">
+            <summary>
+            A JSON constructor.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JTokenType.Property">
+            <summary>
+            A JSON object property.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JTokenType.Comment">
+            <summary>
+            A comment.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JTokenType.Integer">
+            <summary>
+            An integer value.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JTokenType.Float">
+            <summary>
+            A float value.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JTokenType.String">
+            <summary>
+            A string value.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JTokenType.Boolean">
+            <summary>
+            A boolean value.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JTokenType.Null">
+            <summary>
+            A null value.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JTokenType.Undefined">
+            <summary>
+            An undefined value.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JTokenType.Date">
+            <summary>
+            A date value.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JTokenType.Raw">
+            <summary>
+            A raw JSON value.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.JTokenType.Bytes">
+            <summary>
+            A collection of bytes value.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Schema.Extensions">
+            <summary>
+            Contains the JSON schema extension methods.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Schema.Extensions.IsValid(Newtonsoft.Json.Linq.JToken,Newtonsoft.Json.Schema.JsonSchema)">
+            <summary>
+            Determines whether the <see cref="T:Newtonsoft.Json.Linq.JToken"/> is valid.
+            </summary>
+            <param name="source">The source <see cref="T:Newtonsoft.Json.Linq.JToken"/> to test.</param>
+            <param name="schema">The schema to test with.</param>
+            <returns>
+                <c>true</c> if the specified <see cref="T:Newtonsoft.Json.Linq.JToken"/> is valid; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Schema.Extensions.Validate(Newtonsoft.Json.Linq.JToken,Newtonsoft.Json.Schema.JsonSchema)">
+            <summary>
+            Validates the specified <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="source">The source <see cref="T:Newtonsoft.Json.Linq.JToken"/> to test.</param>
+            <param name="schema">The schema to test with.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Schema.Extensions.Validate(Newtonsoft.Json.Linq.JToken,Newtonsoft.Json.Schema.JsonSchema,Newtonsoft.Json.Schema.ValidationEventHandler)">
+            <summary>
+            Validates the specified <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </summary>
+            <param name="source">The source <see cref="T:Newtonsoft.Json.Linq.JToken"/> to test.</param>
+            <param name="schema">The schema to test with.</param>
+            <param name="validationEventHandler">The validation event handler.</param>
+        </member>
+        <member name="T:Newtonsoft.Json.Schema.JsonSchemaException">
+            <summary>
+            Returns detailed information about the schema exception.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Schema.JsonSchemaException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Schema.JsonSchemaException"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Schema.JsonSchemaException.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Schema.JsonSchemaException"/> class
             with a specified error message.
             </summary>
             <param name="message">The error message that explains the reason for the exception.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriterException.#ctor(System.String,System.Exception)">
+        <member name="M:Newtonsoft.Json.Schema.JsonSchemaException.#ctor(System.String,System.Exception)">
             <summary>
-            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonWriterException"/> class
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Schema.JsonSchemaException"/> class
             with a specified error message and a reference to the inner exception that is the cause of this exception.
             </summary>
             <param name="message">The error message that explains the reason for the exception.</param>
             <param name="innerException">The exception that is the cause of the current exception, or a null reference (Nothing in Visual Basic) if no inner exception is specified.</param>
         </member>
-        <member name="T:Newtonsoft.Json.JavaScriptConstructor">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchemaException.LineNumber">
             <summary>
-            Represents a JavaScript constructor.
+            Gets the line number indicating where the error occurred.
             </summary>
+            <value>The line number indicating where the error occurred.</value>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.CollectionUtils.IsNullOrEmpty(System.Collections.ICollection)">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchemaException.LinePosition">
             <summary>
-            Determines whether the collection is null or empty.
+            Gets the line position indicating where the error occurred.
             </summary>
-            <param name="collection">The collection.</param>
-            <returns>
-                <c>true</c> if the collection is null or empty; otherwise, <c>false</c>.
-            </returns>
+            <value>The line position indicating where the error occurred.</value>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.CollectionUtils.IsNullOrEmpty``1(System.Collections.Generic.ICollection{``0})">
+        <member name="T:Newtonsoft.Json.Schema.JsonSchemaResolver">
             <summary>
-            Determines whether the collection is null or empty.
+            Resolves <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> from an id.
             </summary>
-            <param name="collection">The collection.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Schema.JsonSchemaResolver.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Schema.JsonSchemaResolver"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Schema.JsonSchemaResolver.GetSchema(System.String)">
+            <summary>
+            Gets a <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> for the specified id.
+            </summary>
+            <param name="id">The id.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> for the specified id.</returns>
+        </member>
+        <member name="P:Newtonsoft.Json.Schema.JsonSchemaResolver.LoadedSchemas">
+            <summary>
+            Gets or sets the loaded schemas.
+            </summary>
+            <value>The loaded schemas.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.Schema.UndefinedSchemaIdHandling">
+            <summary>
+            Specifies undefined schema Id handling options for the <see cref="T:Newtonsoft.Json.Schema.JsonSchemaGenerator"/>.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Schema.UndefinedSchemaIdHandling.None">
+            <summary>
+            Do not infer a schema Id.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Schema.UndefinedSchemaIdHandling.UseTypeName">
+            <summary>
+            Use the .NET type name as the schema Id.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Schema.UndefinedSchemaIdHandling.UseAssemblyQualifiedName">
+            <summary>
+            Use the assembly qualified .NET type name as the schema Id.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Schema.ValidationEventArgs">
+            <summary>
+            Returns detailed information related to the <see cref="T:Newtonsoft.Json.Schema.ValidationEventHandler"/>.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.Schema.ValidationEventArgs.Exception">
+            <summary>
+            Gets the <see cref="T:Newtonsoft.Json.Schema.JsonSchemaException"/> associated with the validation event.
+            </summary>
+            <value>The JsonSchemaException associated with the validation event.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Schema.ValidationEventArgs.Message">
+            <summary>
+            Gets the text description corresponding to the validation event.
+            </summary>
+            <value>The text description.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.Schema.ValidationEventHandler">
+            <summary>
+            Represents the callback method that will handle JSON schema validation events and the <see cref="T:Newtonsoft.Json.Schema.ValidationEventArgs"/>.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver">
+            <summary>
+            Resolves member mappings for a type, camel casing property names.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Serialization.DefaultContractResolver">
+            <summary>
+            Used by <see cref="T:Newtonsoft.Json.JsonSerializer"/> to resolves a <see cref="T:Newtonsoft.Json.Serialization.JsonContract"/> for a given <see cref="T:System.Type"/>.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Serialization.IContractResolver">
+            <summary>
+            Used by <see cref="T:Newtonsoft.Json.JsonSerializer"/> to resolves a <see cref="T:Newtonsoft.Json.Serialization.JsonContract"/> for a given <see cref="T:System.Type"/>.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.IContractResolver.ResolveContract(System.Type)">
+            <summary>
+            Resolves the contract for a given type.
+            </summary>
+            <param name="type">The type to resolve a contract for.</param>
+            <returns>The contract for a given type.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DefaultContractResolver.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.DefaultContractResolver"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DefaultContractResolver.ResolveContract(System.Type)">
+            <summary>
+            Resolves the contract for a given type.
+            </summary>
+            <param name="type">The type to resolve a contract for.</param>
+            <returns>The contract for a given type.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DefaultContractResolver.GetSerializableMembers(System.Type)">
+            <summary>
+            Gets the serializable members for the type.
+            </summary>
+            <param name="objectType">The type to get serializable members for.</param>
+            <returns>The serializable members for the type.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DefaultContractResolver.CreateObjectContract(System.Type)">
+            <summary>
+            Creates a <see cref="T:Newtonsoft.Json.Serialization.JsonObjectContract"/> for the given type.
+            </summary>
+            <param name="objectType">Type of the object.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Serialization.JsonObjectContract"/> for the given type.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DefaultContractResolver.ResolveContractConverter(System.Type)">
+            <summary>
+            Resolves the default <see cref="T:Newtonsoft.Json.JsonConverter"/> for the contract.
+            </summary>
+            <param name="objectType">Type of the object.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DefaultContractResolver.CreateDictionaryContract(System.Type)">
+            <summary>
+            Creates a <see cref="T:Newtonsoft.Json.Serialization.JsonDictionaryContract"/> for the given type.
+            </summary>
+            <param name="objectType">Type of the object.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Serialization.JsonDictionaryContract"/> for the given type.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DefaultContractResolver.CreateArrayContract(System.Type)">
+            <summary>
+            Creates a <see cref="T:Newtonsoft.Json.Serialization.JsonArrayContract"/> for the given type.
+            </summary>
+            <param name="objectType">Type of the object.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Serialization.JsonArrayContract"/> for the given type.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DefaultContractResolver.CreatePrimitiveContract(System.Type)">
+            <summary>
+            Creates a <see cref="T:Newtonsoft.Json.Serialization.JsonPrimitiveContract"/> for the given type.
+            </summary>
+            <param name="objectType">Type of the object.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Serialization.JsonPrimitiveContract"/> for the given type.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DefaultContractResolver.CreateLinqContract(System.Type)">
+            <summary>
+            Creates a <see cref="T:Newtonsoft.Json.Serialization.JsonLinqContract"/> for the given type.
+            </summary>
+            <param name="objectType">Type of the object.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Serialization.JsonLinqContract"/> for the given type.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DefaultContractResolver.CreateProperties(Newtonsoft.Json.Serialization.JsonObjectContract)">
+            <summary>
+            Creates properties for the given <see cref="T:Newtonsoft.Json.Serialization.JsonObjectContract"/>.
+            </summary>
+            <param name="contract">The contract to create properties for.</param>
+            <returns>Properties for the given <see cref="T:Newtonsoft.Json.Serialization.JsonObjectContract"/>.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DefaultContractResolver.CreateMemberValueProvider(System.Reflection.MemberInfo)">
+            <summary>
+            Creates the <see cref="T:Newtonsoft.Json.Serialization.IValueProvider"/> used by the serializer to get and set values from a member.
+            </summary>
+            <param name="member">The member.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Serialization.IValueProvider"/> used by the serializer to get and set values from a member.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DefaultContractResolver.CreateProperty(Newtonsoft.Json.Serialization.JsonObjectContract,System.Reflection.MemberInfo)">
+            <summary>
+            Creates a <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> for the given <see cref="T:System.Reflection.MemberInfo"/>.
+            </summary>
+            <param name="contract">The member's declaring types <see cref="T:Newtonsoft.Json.Serialization.JsonObjectContract"/>.</param>
+            <param name="member">The member to create a <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> for.</param>
+            <returns>A created <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> for the given <see cref="T:System.Reflection.MemberInfo"/>.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DefaultContractResolver.ResolvePropertyName(System.String)">
+            <summary>
+            Resolves the name of the property.
+            </summary>
+            <param name="propertyName">Name of the property.</param>
+            <returns>Name of the property.</returns>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.DefaultContractResolver.DefaultMembersSearchFlags">
+            <summary>
+            Gets or sets the default members search flags.
+            </summary>
+            <value>The default members search flags.</value>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver.ResolvePropertyName(System.String)">
+            <summary>
+            Resolves the name of the property.
+            </summary>
+            <param name="propertyName">Name of the property.</param>
+            <returns>The property name camel cased.</returns>
+        </member>
+        <member name="T:Newtonsoft.Json.Serialization.DefaultSerializationBinder">
+            <summary>
+            The default serialization binder used when resolving and loading classes from type names.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DefaultSerializationBinder.BindToType(System.String,System.String)">
+            <summary>
+            When overridden in a derived class, controls the binding of a serialized object to a type.
+            </summary>
+            <param name="assemblyName">Specifies the <see cref="T:System.Reflection.Assembly"/> name of the serialized object.</param>
+            <param name="typeName">Specifies the <see cref="T:System.Type"/> name of the serialized object.</param>
             <returns>
-                <c>true</c> if the collection is null or empty; otherwise, <c>false</c>.
+            The type of the object the formatter creates a new instance of.
             </returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.CollectionUtils.IsNullOrEmptyOrDefault``1(System.Collections.Generic.IList{``0})">
+        <member name="T:Newtonsoft.Json.Serialization.DynamicValueProvider">
             <summary>
-            Determines whether the collection is null, empty or its contents are uninitialized values.
+            Get and set values for a <see cref="T:System.Reflection.MemberInfo"/> using dynamic methods.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Serialization.IValueProvider">
+            <summary>
+            Provides methods to get and set values.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.IValueProvider.SetValue(System.Object,System.Object)">
+            <summary>
+            Sets the value.
+            </summary>
+            <param name="target">The target to set the value on.</param>
+            <param name="value">The value to set on the target.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.IValueProvider.GetValue(System.Object)">
+            <summary>
+            Gets the value.
+            </summary>
+            <param name="target">The target to get the value from.</param>
+            <returns>The value.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DynamicValueProvider.#ctor(System.Reflection.MemberInfo)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.DynamicValueProvider"/> class.
+            </summary>
+            <param name="memberInfo">The member info.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DynamicValueProvider.SetValue(System.Object,System.Object)">
+            <summary>
+            Sets the value.
+            </summary>
+            <param name="target">The target to set the value on.</param>
+            <param name="value">The value to set on the target.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.DynamicValueProvider.GetValue(System.Object)">
+            <summary>
+            Gets the value.
+            </summary>
+            <param name="target">The target to get the value from.</param>
+            <returns>The value.</returns>
+        </member>
+        <member name="T:Newtonsoft.Json.Serialization.ErrorContext">
+            <summary>
+            Provides information surrounding an error.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.ErrorContext.Error">
+            <summary>
+            Gets or sets the error.
+            </summary>
+            <value>The error.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.ErrorContext.OriginalObject">
+            <summary>
+            Gets the original object that caused the error.
+            </summary>
+            <value>The original object that caused the error.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.ErrorContext.Member">
+            <summary>
+            Gets the member that caused the error.
+            </summary>
+            <value>The member that caused the error.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.ErrorContext.Handled">
+            <summary>
+            Gets or sets a value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.ErrorContext"/> is handled.
+            </summary>
+            <value><c>true</c> if handled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.Serialization.ErrorEventArgs">
+            <summary>
+            Provides data for the Error event.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.ErrorEventArgs.#ctor(System.Object,Newtonsoft.Json.Serialization.ErrorContext)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.ErrorEventArgs"/> class.
+            </summary>
+            <param name="currentObject">The current object.</param>
+            <param name="errorContext">The error context.</param>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.ErrorEventArgs.CurrentObject">
+            <summary>
+            Gets the current object the error event is being raised against.
+            </summary>
+            <value>The current object the error event is being raised against.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.ErrorEventArgs.ErrorContext">
+            <summary>
+            Gets the error context.
+            </summary>
+            <value>The error context.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.Serialization.JsonArrayContract">
+            <summary>
+            Contract details for a <see cref="T:System.Type"/> used by the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Serialization.JsonContract">
+            <summary>
+            Contract details for a <see cref="T:System.Type"/> used by the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonContract.UnderlyingType">
+            <summary>
+            Gets the underlying type for the contract.
+            </summary>
+            <value>The underlying type for the contract.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonContract.CreatedType">
+            <summary>
+            Gets or sets the type created during deserialization.
+            </summary>
+            <value>The type created during deserialization.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonContract.IsReference">
+            <summary>
+            Gets or sets whether this type contract is serialized as a reference.
+            </summary>
+            <value>Whether this type contract is serialized as a reference.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonContract.Converter">
+            <summary>
+            Gets or sets the default <see cref="T:Newtonsoft.Json.JsonConverter"/> for this contract.
+            </summary>
+            <value>The converter.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonContract.OnDeserialized">
+            <summary>
+            Gets or sets the method called immediately after deserialization of the object.
+            </summary>
+            <value>The method called immediately after deserialization of the object.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonContract.OnDeserializing">
+            <summary>
+            Gets or sets the method called during deserialization of the object.
+            </summary>
+            <value>The method called during deserialization of the object.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonContract.OnSerialized">
+            <summary>
+            Gets or sets the method called after serialization of the object graph.
+            </summary>
+            <value>The method called after serialization of the object graph.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonContract.OnSerializing">
+            <summary>
+            Gets or sets the method called before serialization of the object.
+            </summary>
+            <value>The method called before serialization of the object.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonContract.DefaultCreator">
+            <summary>
+            Gets or sets the default creator.
+            </summary>
+            <value>The default creator.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonContract.DefaultCreatorNonPublic">
+            <summary>
+            Gets or sets a value indicating whether [default creator non public].
+            </summary>
+            <value><c>true</c> if the default object creator is non-public; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonContract.OnError">
+            <summary>
+            Gets or sets the method called when an error is thrown during the serialization of the object.
+            </summary>
+            <value>The method called when an error is thrown during the serialization of the object.</value>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.JsonArrayContract.#ctor(System.Type)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.JsonArrayContract"/> class.
+            </summary>
+            <param name="underlyingType">The underlying type for the contract.</param>
+        </member>
+        <member name="T:Newtonsoft.Json.Serialization.JsonDictionaryContract">
+            <summary>
+            Contract details for a <see cref="T:System.Type"/> used by the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.JsonDictionaryContract.#ctor(System.Type)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.JsonDictionaryContract"/> class.
+            </summary>
+            <param name="underlyingType">The underlying type for the contract.</param>
+        </member>
+        <member name="T:Newtonsoft.Json.Serialization.JsonLinqContract">
+            <summary>
+            Contract details for a <see cref="T:System.Type"/> used by the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.JsonLinqContract.#ctor(System.Type)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.JsonLinqContract"/> class.
+            </summary>
+            <param name="underlyingType">The underlying type for the contract.</param>
+        </member>
+        <member name="T:Newtonsoft.Json.Serialization.JsonPrimitiveContract">
+            <summary>
+            Contract details for a <see cref="T:System.Type"/> used by the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.JsonPrimitiveContract.#ctor(System.Type)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.JsonPrimitiveContract"/> class.
+            </summary>
+            <param name="underlyingType">The underlying type for the contract.</param>
+        </member>
+        <member name="T:Newtonsoft.Json.Serialization.JsonProperty">
+            <summary>
+            Maps a JSON property to a .NET member.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonProperty.PropertyName">
+            <summary>
+            Gets the name of the property.
+            </summary>
+            <value>The name of the property.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonProperty.ValueProvider">
+            <summary>
+            Gets the <see cref="T:Newtonsoft.Json.Serialization.IValueProvider"/> that will get and set the <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> during serialization.
+            </summary>
+            <value>The <see cref="T:Newtonsoft.Json.Serialization.IValueProvider"/> that will get and set the <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> during serialization.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonProperty.PropertyType">
+            <summary>
+            Gets or sets the type of the property.
+            </summary>
+            <value>The type of the property.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonProperty.Converter">
+            <summary>
+            Gets or sets the <see cref="T:Newtonsoft.Json.JsonConverter"/> for the property.
+            If set this converter takes presidence over the contract converter for the property type.
+            </summary>
+            <value>The converter.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonProperty.Ignored">
+            <summary>
+            Gets a value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> is ignored.
+            </summary>
+            <value><c>true</c> if ignored; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonProperty.Readable">
+            <summary>
+            Gets a value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> is readable.
+            </summary>
+            <value><c>true</c> if readable; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonProperty.Writable">
+            <summary>
+            Gets a value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> is writable.
+            </summary>
+            <value><c>true</c> if writable; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonProperty.MemberConverter">
+            <summary>
+            Gets the member converter.
+            </summary>
+            <value>The member converter.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonProperty.DefaultValue">
+            <summary>
+            Gets the default value.
+            </summary>
+            <value>The default value.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonProperty.Required">
+            <summary>
+            Gets a value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> is required.
+            </summary>
+            <value>A value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> is required.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonProperty.IsReference">
+            <summary>
+            Gets a value indicating whether this property preserves object references.
+            </summary>
+            <value>
+                <c>true</c> if this instance is reference; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonProperty.NullValueHandling">
+            <summary>
+            Gets the property null value handling.
+            </summary>
+            <value>The null value handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonProperty.DefaultValueHandling">
+            <summary>
+            Gets the property default value handling.
+            </summary>
+            <value>The default value handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonProperty.ReferenceLoopHandling">
+            <summary>
+            Gets the property reference loop handling.
+            </summary>
+            <value>The reference loop handling.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonProperty.ObjectCreationHandling">
+            <summary>
+            Gets the property object creation handling.
+            </summary>
+            <value>The object creation handling.</value>
+        </member>
+        <member name="T:Newtonsoft.Json.Serialization.JsonPropertyCollection">
+            <summary>
+            A collection of <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> objects.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.JsonPropertyCollection.#ctor(Newtonsoft.Json.Serialization.JsonObjectContract)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.JsonPropertyCollection"/> class.
+            </summary>
+            <param name="contract">The contract.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.JsonPropertyCollection.GetKeyForItem(Newtonsoft.Json.Serialization.JsonProperty)">
+            <summary>
+            When implemented in a derived class, extracts the key from the specified element.
+            </summary>
+            <param name="item">The element from which to extract the key.</param>
+            <returns>The key for the specified element.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.JsonPropertyCollection.AddProperty(Newtonsoft.Json.Serialization.JsonProperty)">
+            <summary>
+            Adds a <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> object.
+            </summary>
+            <param name="property">The property to add to the collection.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.JsonPropertyCollection.GetClosestMatchProperty(System.String)">
+            <summary>
+            Gets the closest matching <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> object.
+            First attempts to get an exact case match of propertyName and then
+            a case insensitive match.
+            </summary>
+            <param name="propertyName">Name of the property.</param>
+            <returns>A matching property if found.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.JsonPropertyCollection.GetProperty(System.String,System.StringComparison)">
+            <summary>
+            Gets a property by property name.
+            </summary>
+            <param name="propertyName">The name of the property to get.</param>
+            <param name="comparisonType">Type property name string comparison.</param>
+            <returns>A matching property if found.</returns>
+        </member>
+        <member name="T:Newtonsoft.Json.MissingMemberHandling">
+            <summary>
+            Specifies missing member handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.MissingMemberHandling.Ignore">
+            <summary>
+            Ignore a missing member and do not attempt to deserialize it.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.MissingMemberHandling.Error">
+            <summary>
+            Throw a <see cref="T:Newtonsoft.Json.JsonSerializationException"/> when a missing member is encountered during deserialization.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.NullValueHandling">
+            <summary>
+            Specifies null value handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.NullValueHandling.Include">
+            <summary>
+            Include null values when serializing and deserializing objects.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.NullValueHandling.Ignore">
+            <summary>
+            Ignore null values when serializing and deserializing objects.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.ReferenceLoopHandling">
+            <summary>
+            Specifies reference loop handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.ReferenceLoopHandling.Error">
+            <summary>
+            Throw a <see cref="T:Newtonsoft.Json.JsonSerializationException"/> when a loop is encountered.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.ReferenceLoopHandling.Ignore">
+            <summary>
+            Ignore loop references and do not serialize.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.ReferenceLoopHandling.Serialize">
+            <summary>
+            Serialize loop references.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Schema.JsonSchema">
+            <summary>
+            An in-memory representation of a JSON Schema.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Schema.JsonSchema.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Schema.JsonSchema.Read(Newtonsoft.Json.JsonReader)">
+            <summary>
+            Reads a <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> from the specified <see cref="T:Newtonsoft.Json.JsonReader"/>.
+            </summary>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> containing the JSON Schema to read.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> object representing the JSON Schema.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Schema.JsonSchema.Read(Newtonsoft.Json.JsonReader,Newtonsoft.Json.Schema.JsonSchemaResolver)">
+            <summary>
+            Reads a <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> from the specified <see cref="T:Newtonsoft.Json.JsonReader"/>.
+            </summary>
+            <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> containing the JSON Schema to read.</param>
+            <param name="resolver">The <see cref="T:Newtonsoft.Json.Schema.JsonSchemaResolver"/> to use when resolving schema references.</param>
+            <returns>The <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> object representing the JSON Schema.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Schema.JsonSchema.Parse(System.String)">
+            <summary>
+            Load a <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> from a string that contains schema JSON.
+            </summary>
+            <param name="json">A <see cref="T:System.String"/> that contains JSON.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> populated from the string that contains JSON.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Schema.JsonSchema.Parse(System.String,Newtonsoft.Json.Schema.JsonSchemaResolver)">
+            <summary>
+            Parses the specified json.
+            </summary>
+            <param name="json">The json.</param>
+            <param name="resolver">The resolver.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> populated from the string that contains JSON.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Schema.JsonSchema.WriteTo(Newtonsoft.Json.JsonWriter)">
+            <summary>
+            Writes this schema to a <see cref="T:Newtonsoft.Json.JsonWriter"/>.
+            </summary>
+            <param name="writer">A <see cref="T:Newtonsoft.Json.JsonWriter"/> into which this method will write.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Schema.JsonSchema.WriteTo(Newtonsoft.Json.JsonWriter,Newtonsoft.Json.Schema.JsonSchemaResolver)">
+            <summary>
+            Writes this schema to a <see cref="T:Newtonsoft.Json.JsonWriter"/> using the specified <see cref="T:Newtonsoft.Json.Schema.JsonSchemaResolver"/>.
+            </summary>
+            <param name="writer">A <see cref="T:Newtonsoft.Json.JsonWriter"/> into which this method will write.</param>
+            <param name="resolver">The resolver used.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Schema.JsonSchema.ToString">
+            <summary>
+            Returns a <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
             </summary>
-            <param name="list">The list.</param>
             <returns>
-                <c>true</c> if the collection is null or empty or its contents are uninitialized values; otherwise, <c>false</c>.
+            A <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
             </returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.CollectionUtils.Slice``1(System.Collections.Generic.IList{``0},System.Nullable{System.Int32},System.Nullable{System.Int32})">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Id">
             <summary>
-            Makes a slice of the specified list in between the start and end indexes.
+            Gets or sets the id.
             </summary>
-            <param name="list">The list.</param>
-            <param name="start">The start index.</param>
-            <param name="end">The end index.</param>
-            <returns>A slice of the list.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.CollectionUtils.Slice``1(System.Collections.Generic.IList{``0},System.Nullable{System.Int32},System.Nullable{System.Int32},System.Nullable{System.Int32})">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Title">
             <summary>
-            Makes a slice of the specified list in between the start and end indexes,
-            getting every so many items based upon the step.
+            Gets or sets the title.
             </summary>
-            <param name="list">The list.</param>
-            <param name="start">The start index.</param>
-            <param name="end">The end index.</param>
-            <param name="step">The step.</param>
-            <returns>A slice of the list.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.CollectionUtils.GroupBy``2(System.Collections.Generic.ICollection{``1},Newtonsoft.Json.Utilities.Func{``1,``0})">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Optional">
             <summary>
-            Group the collection using a function which returns the key.
+            Gets or sets whether the object is optional.
             </summary>
-            <param name="source">The source collection to group.</param>
-            <param name="keySelector">The key selector.</param>
-            <returns>A Dictionary with each key relating to a list of objects in a list grouped under it.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.Utilities.CollectionUtils.AddRange``1(System.Collections.Generic.IList{``0},System.Collections.Generic.IEnumerable{``0})">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.ReadOnly">
             <summary>
-            Adds the elements of the specified collection to the specified generic IList.
+            Gets or sets whether the object is read only.
             </summary>
-            <param name="initial">The list to add to.</param>
-            <param name="collection">The collection of elements to add.</param>
         </member>
-        <member name="T:Newtonsoft.Json.StringBuffer">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Hidden">
             <summary>
-            Builds a string. Unlike StringBuilder this class lets you reuse it's internal buffer.
+            Gets or sets whether the object is visible to users.
             </summary>
         </member>
-        <member name="T:Newtonsoft.Json.JavaScriptObject">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Transient">
             <summary>
-            Represents a JavaScript object.
+            Gets or sets whether the object is transient.
             </summary>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptObject.#ctor">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Description">
             <summary>
-            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JavaScriptObject"/> class.
+            Gets or sets the description of the object.
             </summary>
         </member>
-        <member name="M:Newtonsoft.Json.JavaScriptObject.#ctor(Newtonsoft.Json.JavaScriptObject)">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Type">
             <summary>
-            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JavaScriptObject"/> class that
-            contains values copied from the specified <see cref="T:Newtonsoft.Json.JavaScriptObject"/>.
+            Gets or sets the types of values allowed by the object.
             </summary>
-            <param name="javaScriptObject">The <see cref="T:Newtonsoft.Json.JavaScriptObject"/> whose elements are copied to the new object.</param>
+            <value>The type.</value>
         </member>
-        <member name="T:Newtonsoft.Json.JsonToken">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Pattern">
             <summary>
-            Specifies the type of Json token.
+            Gets or sets the pattern.
             </summary>
+            <value>The pattern.</value>
         </member>
-        <member name="F:Newtonsoft.Json.JsonToken.None">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.MinimumLength">
             <summary>
-            This is returned by the <see cref="T:Newtonsoft.Json.JsonReader"/> if a <see cref="M:Newtonsoft.Json.JsonReader.Read"/> method has not been called. 
+            Gets or sets the minimum length.
             </summary>
+            <value>The minimum length.</value>
         </member>
-        <member name="F:Newtonsoft.Json.JsonToken.StartObject">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.MaximumLength">
             <summary>
-            An object start token.
+            Gets or sets the maximum length.
             </summary>
+            <value>The maximum length.</value>
         </member>
-        <member name="F:Newtonsoft.Json.JsonToken.StartArray">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.MaximumDecimals">
             <summary>
-            An array start token.
+            Gets or sets the maximum decimals.
             </summary>
+            <value>The maximum decimals.</value>
         </member>
-        <member name="F:Newtonsoft.Json.JsonToken.PropertyName">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Minimum">
             <summary>
-            An object property name.
+            Gets or sets the minimum.
             </summary>
+            <value>The minimum.</value>
         </member>
-        <member name="F:Newtonsoft.Json.JsonToken.Comment">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Maximum">
             <summary>
-            A comment.
+            Gets or sets the maximum.
             </summary>
+            <value>The maximum.</value>
         </member>
-        <member name="F:Newtonsoft.Json.JsonToken.Integer">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.MinimumItems">
             <summary>
-            An interger.
+            Gets or sets the minimum number of items.
             </summary>
+            <value>The minimum number of items.</value>
         </member>
-        <member name="F:Newtonsoft.Json.JsonToken.Float">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.MaximumItems">
             <summary>
-            A float.
+            Gets or sets the maximum number of items.
             </summary>
+            <value>The maximum number of items.</value>
         </member>
-        <member name="F:Newtonsoft.Json.JsonToken.String">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Items">
             <summary>
-            A string.
+            Gets or sets the <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> of items.
             </summary>
+            <value>The <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> of items.</value>
         </member>
-        <member name="F:Newtonsoft.Json.JsonToken.Boolean">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Properties">
             <summary>
-            A boolean.
+            Gets or sets the <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> of properties.
             </summary>
+            <value>The <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> of properties.</value>
         </member>
-        <member name="F:Newtonsoft.Json.JsonToken.Null">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.AdditionalProperties">
             <summary>
-            A null token.
+            Gets or sets the <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> of additional properties.
             </summary>
+            <value>The <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> of additional properties.</value>
         </member>
-        <member name="F:Newtonsoft.Json.JsonToken.Undefined">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.AllowAdditionalProperties">
             <summary>
-            An undefined token.
+            Gets or sets a value indicating whether additional properties are allowed.
             </summary>
+            <value>
+                <c>true</c> if additional properties are allowed; otherwise, <c>false</c>.
+            </value>
         </member>
-        <member name="F:Newtonsoft.Json.JsonToken.EndObject">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Requires">
             <summary>
-            An object end token.
+            Gets or sets the required property if this property is present.
             </summary>
+            <value>The required property if this property is present.</value>
         </member>
-        <member name="F:Newtonsoft.Json.JsonToken.EndArray">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Identity">
             <summary>
-            An array end token.
+            Gets or sets the identity.
             </summary>
+            <value>The identity.</value>
         </member>
-        <member name="F:Newtonsoft.Json.JsonToken.Constructor">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Enum">
             <summary>
-            A JavaScript object constructor.
+            Gets or sets the a collection of valid enum values allowed.
             </summary>
+            <value>A collection of valid enum values allowed.</value>
         </member>
-        <member name="F:Newtonsoft.Json.JsonToken.Date">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Options">
             <summary>
-            A Date.
+            Gets or sets a collection of options.
             </summary>
+            <value>A collection of options.</value>
         </member>
-        <member name="M:Newtonsoft.Json.Converters.XmlNodeConverter.IsNamespaceAttribute(System.String,System.String@)">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Disallow">
             <summary>
-            Checks if the attributeName is a namespace attribute.
+            Gets or sets disallowed types.
             </summary>
-            <param name="attributeName">Attribute name to test.</param>
-            <param name="prefix">The attribute name prefix if it has one, otherwise an empty string.</param>
-            <returns>True if attribute name is for a namespace attribute, otherwise false.</returns>
+            <value>The disallow types.</value>
         </member>
-        <member name="T:Newtonsoft.Json.WriteState">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Default">
             <summary>
-            Specifies the state of the <see cref="T:Newtonsoft.Json.JsonWriter"/>.
+            Gets or sets the default value.
             </summary>
+            <value>The default value.</value>
         </member>
-        <member name="F:Newtonsoft.Json.WriteState.Error">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Extends">
             <summary>
-            An exception has been thrown, which has left the <see cref="T:Newtonsoft.Json.JsonWriter"/> in an invalid state.
-            You may call the <see cref="M:Newtonsoft.Json.JsonWriter.Close"/> method to put the <see cref="T:Newtonsoft.Json.JsonWriter"/> in the <c>Closed</c> state.
-            Any other <see cref="T:Newtonsoft.Json.JsonWriter"/> method calls results in an <see cref="T:System.InvalidOperationException"/> being thrown. 
+            Gets or sets the extend <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/>.
             </summary>
+            <value>The extended <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/>.</value>
         </member>
-        <member name="F:Newtonsoft.Json.WriteState.Closed">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchema.Format">
             <summary>
-            The <see cref="M:Newtonsoft.Json.JsonWriter.Close"/> method has been called. 
+            Gets or sets the format.
             </summary>
+            <value>The format.</value>
         </member>
-        <member name="F:Newtonsoft.Json.WriteState.Object">
+        <member name="T:Newtonsoft.Json.Schema.JsonSchemaGenerator">
             <summary>
-            An object is being written. 
+            Generates a <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> from a specified <see cref="T:System.Type"/>.
             </summary>
         </member>
-        <member name="F:Newtonsoft.Json.WriteState.Array">
+        <member name="M:Newtonsoft.Json.Schema.JsonSchemaGenerator.Generate(System.Type)">
             <summary>
-            A array is being written.
+            Generate a <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> from the specified type.
             </summary>
+            <param name="type">The type to generate a <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> from.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> generated from the specified type.</returns>
         </member>
-        <member name="F:Newtonsoft.Json.WriteState.Property">
+        <member name="M:Newtonsoft.Json.Schema.JsonSchemaGenerator.Generate(System.Type,Newtonsoft.Json.Schema.JsonSchemaResolver)">
             <summary>
-            A property is being written.
+            Generate a <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> from the specified type.
             </summary>
+            <param name="type">The type to generate a <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> from.</param>
+            <param name="resolver">The <see cref="T:Newtonsoft.Json.Schema.JsonSchemaResolver"/> used to resolve schema references.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> generated from the specified type.</returns>
         </member>
-        <member name="F:Newtonsoft.Json.WriteState.Start">
+        <member name="M:Newtonsoft.Json.Schema.JsonSchemaGenerator.Generate(System.Type,System.Boolean)">
             <summary>
-            A write method has not been called.
+            Generate a <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> from the specified type.
             </summary>
+            <param name="type">The type to generate a <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> from.</param>
+            <param name="rootSchemaNullable">Specify whether the generated root <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> will be nullable.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> generated from the specified type.</returns>
         </member>
-        <member name="T:Newtonsoft.Json.Formatting">
+        <member name="M:Newtonsoft.Json.Schema.JsonSchemaGenerator.Generate(System.Type,Newtonsoft.Json.Schema.JsonSchemaResolver,System.Boolean)">
             <summary>
-            Specifies formatting options for the <see cref="T:Newtonsoft.Json.JsonWriter"/>.
+            Generate a <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> from the specified type.
             </summary>
+            <param name="type">The type to generate a <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> from.</param>
+            <param name="resolver">The <see cref="T:Newtonsoft.Json.Schema.JsonSchemaResolver"/> used to resolve schema references.</param>
+            <param name="rootSchemaNullable">Specify whether the generated root <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> will be nullable.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> generated from the specified type.</returns>
         </member>
-        <member name="F:Newtonsoft.Json.Formatting.None">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchemaGenerator.UndefinedSchemaIdHandling">
             <summary>
-            No special formatting is applied. This is the default.
+            Gets or sets how undefined schemas are handled by the serializer.
             </summary>
         </member>
-        <member name="F:Newtonsoft.Json.Formatting.Indented">
+        <member name="P:Newtonsoft.Json.Schema.JsonSchemaGenerator.ContractResolver">
             <summary>
-            Causes child objects to be indented according to the <see cref="P:Newtonsoft.Json.JsonWriter.Indentation"/> and <see cref="P:Newtonsoft.Json.JsonWriter.IndentChar"/> settings.
+            Gets or sets the contract resolver.
             </summary>
+            <value>The contract resolver.</value>
         </member>
-        <member name="T:Newtonsoft.Json.JsonWriter">
+        <member name="T:Newtonsoft.Json.Schema.JsonSchemaType">
             <summary>
-            Represents a writer that provides a fast, non-cached, forward-only way of generating Json data.
+            The value types allowed by the <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/>.
             </summary>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.#ctor(System.IO.TextWriter)">
+        <member name="F:Newtonsoft.Json.Schema.JsonSchemaType.None">
             <summary>
-            Creates an instance of the <c>JsonWriter</c> class using the specified <see cref="T:System.IO.TextWriter"/>. 
+            No type specified.
             </summary>
-            <param name="textWriter">The <c>TextWriter</c> to write to.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.Flush">
+        <member name="F:Newtonsoft.Json.Schema.JsonSchemaType.String">
             <summary>
-            Flushes whatever is in the buffer to the underlying streams and also flushes the underlying stream.
+            String type.
             </summary>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.Close">
+        <member name="F:Newtonsoft.Json.Schema.JsonSchemaType.Float">
             <summary>
-            Closes this stream and the underlying stream.
+            Float type.
             </summary>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteStartObject">
+        <member name="F:Newtonsoft.Json.Schema.JsonSchemaType.Integer">
             <summary>
-            Writes the beginning of a Json object.
+            Integer type.
             </summary>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteEndObject">
+        <member name="F:Newtonsoft.Json.Schema.JsonSchemaType.Boolean">
             <summary>
-            Writes the end of a Json object.
+            Boolean type.
             </summary>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteStartArray">
+        <member name="F:Newtonsoft.Json.Schema.JsonSchemaType.Object">
             <summary>
-            Writes the beginning of a Json array.
+            Object type.
             </summary>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteEndArray">
+        <member name="F:Newtonsoft.Json.Schema.JsonSchemaType.Array">
             <summary>
-            Writes the end of an array.
+            Array type.
             </summary>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WritePropertyName(System.String)">
+        <member name="F:Newtonsoft.Json.Schema.JsonSchemaType.Null">
             <summary>
-            Writes the property name of a name/value pair on a Json object.
+            Null type.
             </summary>
-            <param name="name"></param>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteEnd">
+        <member name="F:Newtonsoft.Json.Schema.JsonSchemaType.Any">
             <summary>
-            Writes the end of the current Json object or array.
+            Any type.
             </summary>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteNull">
+        <member name="T:Newtonsoft.Json.Serialization.JsonObjectContract">
             <summary>
-            Writes a null value.
+            Contract details for a <see cref="T:System.Type"/> used by the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
             </summary>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteUndefined">
+        <member name="M:Newtonsoft.Json.Serialization.JsonObjectContract.#ctor(System.Type)">
             <summary>
-            Writes an undefined value.
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.JsonObjectContract"/> class.
             </summary>
+            <param name="underlyingType">The underlying type for the contract.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteRaw(System.String)">
+        <member name="P:Newtonsoft.Json.Serialization.JsonObjectContract.MemberSerialization">
             <summary>
-            Writes raw JavaScript manually.
+            Gets or sets the object member serialization.
             </summary>
-            <param name="javaScript">The raw JavaScript to write.</param>
+            <value>The member object serialization.</value>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.String)">
+        <member name="P:Newtonsoft.Json.Serialization.JsonObjectContract.Properties">
             <summary>
-            Writes a <see cref="T:System.String"/> value.
+            Gets the object's properties.
             </summary>
-            <param name="value">The <see cref="T:System.String"/> value to write.</param>
+            <value>The object's properties.</value>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Int32)">
+        <member name="P:Newtonsoft.Json.Serialization.JsonObjectContract.ParametrizedConstructor">
             <summary>
-            Writes a <see cref="T:System.Int32"/> value.
+            Gets or sets the parametrized constructor used to create the object.
             </summary>
-            <param name="value">The <see cref="T:System.Int32"/> value to write.</param>
+            <value>The parametrized constructor.</value>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.UInt32)">
+        <member name="T:Newtonsoft.Json.Serialization.OnErrorAttribute">
             <summary>
-            Writes a <see cref="T:System.UInt32"/> value.
+            When applied to a method, specifies that the method is called when an error occurs serializing an object.
             </summary>
-            <param name="value">The <see cref="T:System.UInt32"/> value to write.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Int64)">
+        <member name="T:Newtonsoft.Json.Serialization.ReflectionValueProvider">
             <summary>
-            Writes a <see cref="T:System.Int64"/> value.
+            Get and set values for a <see cref="T:System.Reflection.MemberInfo"/> using reflection.
             </summary>
-            <param name="value">The <see cref="T:System.Int64"/> value to write.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.UInt64)">
+        <member name="M:Newtonsoft.Json.Serialization.ReflectionValueProvider.#ctor(System.Reflection.MemberInfo)">
             <summary>
-            Writes a <see cref="T:System.UInt64"/> value.
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.ReflectionValueProvider"/> class.
             </summary>
-            <param name="value">The <see cref="T:System.UInt64"/> value to write.</param>
+            <param name="memberInfo">The member info.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Single)">
+        <member name="M:Newtonsoft.Json.Serialization.ReflectionValueProvider.SetValue(System.Object,System.Object)">
             <summary>
-            Writes a <see cref="T:System.Single"/> value.
+            Sets the value.
             </summary>
-            <param name="value">The <see cref="T:System.Single"/> value to write.</param>
+            <param name="target">The target to set the value on.</param>
+            <param name="value">The value to set on the target.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Double)">
+        <member name="M:Newtonsoft.Json.Serialization.ReflectionValueProvider.GetValue(System.Object)">
             <summary>
-            Writes a <see cref="T:System.Double"/> value.
+            Gets the value.
             </summary>
-            <param name="value">The <see cref="T:System.Double"/> value to write.</param>
+            <param name="target">The target to get the value from.</param>
+            <returns>The value.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Boolean)">
+        <member name="T:Newtonsoft.Json.TypeNameHandling">
             <summary>
-            Writes a <see cref="T:System.Boolean"/> value.
+            Specifies type name handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
             </summary>
-            <param name="value">The <see cref="T:System.Boolean"/> value to write.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Int16)">
+        <member name="F:Newtonsoft.Json.TypeNameHandling.None">
             <summary>
-            Writes a <see cref="T:System.Int16"/> value.
+            Do not include the .NET type name when serializing types.
             </summary>
-            <param name="value">The <see cref="T:System.Int16"/> value to write.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.UInt16)">
+        <member name="F:Newtonsoft.Json.TypeNameHandling.Objects">
             <summary>
-            Writes a <see cref="T:System.UInt16"/> value.
+            Include the .NET type name when serializing into a JSON object structure.
             </summary>
-            <param name="value">The <see cref="T:System.UInt16"/> value to write.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Char)">
+        <member name="F:Newtonsoft.Json.TypeNameHandling.Arrays">
             <summary>
-            Writes a <see cref="T:System.Char"/> value.
+            Include the .NET type name when serializing into a JSON array structure.
             </summary>
-            <param name="value">The <see cref="T:System.Char"/> value to write.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Byte)">
+        <member name="F:Newtonsoft.Json.TypeNameHandling.All">
             <summary>
-            Writes a <see cref="T:System.Byte"/> value.
+            Always include the .NET type name when serializing.
             </summary>
-            <param name="value">The <see cref="T:System.Byte"/> value to write.</param>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.SByte)">
+        <member name="M:Newtonsoft.Json.Utilities.ConvertUtils.Convert``1(System.Object)">
             <summary>
-            Writes a <see cref="T:System.SByte"/> value.
+            Converts the value to the specified type.
             </summary>
-            <param name="value">The <see cref="T:System.SByte"/> value to write.</param>
+            <typeparam name="T">The type to convert the value to.</typeparam>
+            <param name="initialValue">The value to convert.</param>
+            <returns>The converted type.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.Decimal)">
+        <member name="M:Newtonsoft.Json.Utilities.ConvertUtils.Convert``1(System.Object,System.Globalization.CultureInfo)">
             <summary>
-            Writes a <see cref="T:System.Decimal"/> value.
+            Converts the value to the specified type.
             </summary>
-            <param name="value">The <see cref="T:System.Decimal"/> value to write.</param>
+            <typeparam name="T">The type to convert the value to.</typeparam>
+            <param name="initialValue">The value to convert.</param>
+            <param name="culture">The culture to use when converting.</param>
+            <returns>The converted type.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteValue(System.DateTime)">
+        <member name="M:Newtonsoft.Json.Utilities.ConvertUtils.Convert(System.Object,System.Globalization.CultureInfo,System.Type)">
             <summary>
-            Writes a <see cref="T:System.DateTime"/> value.
+            Converts the value to the specified type.
             </summary>
-            <param name="value">The <see cref="T:System.DateTime"/> value to write.</param>
+            <param name="initialValue">The value to convert.</param>
+            <param name="culture">The culture to use when converting.</param>
+            <param name="targetType">The type to convert the value to.</param>
+            <returns>The converted type.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteComment(System.String)">
+        <member name="M:Newtonsoft.Json.Utilities.ConvertUtils.TryConvert``1(System.Object,``0@)">
             <summary>
-            Writes out a comment <code>/*...*/</code> containing the specified text. 
+            Converts the value to the specified type.
             </summary>
-            <param name="text">Text to place inside the comment.</param>
+            <typeparam name="T">The type to convert the value to.</typeparam>
+            <param name="initialValue">The value to convert.</param>
+            <param name="convertedValue">The converted value if the conversion was successful or the default value of <c>T</c> if it failed.</param>
+            <returns>
+                <c>true</c> if <c>initialValue</c> was converted successfully; otherwise, <c>false</c>.
+            </returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonWriter.WriteWhitespace(System.String)">
+        <member name="M:Newtonsoft.Json.Utilities.ConvertUtils.TryConvert``1(System.Object,System.Globalization.CultureInfo,``0@)">
             <summary>
-            Writes out the given white space.
+            Converts the value to the specified type.
             </summary>
-            <param name="ws">The string of white space characters.</param>
+            <typeparam name="T">The type to convert the value to.</typeparam>
+            <param name="initialValue">The value to convert.</param>
+            <param name="culture">The culture to use when converting.</param>
+            <param name="convertedValue">The converted value if the conversion was successful or the default value of <c>T</c> if it failed.</param>
+            <returns>
+                <c>true</c> if <c>initialValue</c> was converted successfully; otherwise, <c>false</c>.
+            </returns>
         </member>
-        <member name="P:Newtonsoft.Json.JsonWriter.WriteState">
+        <member name="M:Newtonsoft.Json.Utilities.ConvertUtils.TryConvert(System.Object,System.Globalization.CultureInfo,System.Type,System.Object@)">
             <summary>
-            Gets the state of the writer.
+            Converts the value to the specified type.
             </summary>
+            <param name="initialValue">The value to convert.</param>
+            <param name="culture">The culture to use when converting.</param>
+            <param name="targetType">The type to convert the value to.</param>
+            <param name="convertedValue">The converted value if the conversion was successful or the default value of <c>T</c> if it failed.</param>
+            <returns>
+                <c>true</c> if <c>initialValue</c> was converted successfully; otherwise, <c>false</c>.
+            </returns>
         </member>
-        <member name="P:Newtonsoft.Json.JsonWriter.Formatting">
+        <member name="M:Newtonsoft.Json.Utilities.ConvertUtils.ConvertOrCast``1(System.Object)">
             <summary>
-            Indicates how the output is formatted.
+            Converts the value to the specified type. If the value is unable to be converted, the
+            value is checked whether it assignable to the specified type.
             </summary>
+            <typeparam name="T">The type to convert or cast the value to.</typeparam>
+            <param name="initialValue">The value to convert.</param>
+            <returns>The converted type. If conversion was unsuccessful, the initial value is returned if assignable to the target type</returns>
         </member>
-        <member name="P:Newtonsoft.Json.JsonWriter.Indentation">
+        <member name="M:Newtonsoft.Json.Utilities.ConvertUtils.ConvertOrCast``1(System.Object,System.Globalization.CultureInfo)">
             <summary>
-            Gets or sets how many IndentChars to write for each level in the hierarchy when <paramref name="Formatting"/> is set to <c>Formatting.Indented</c>.
+            Converts the value to the specified type. If the value is unable to be converted, the
+            value is checked whether it assignable to the specified type.
             </summary>
+            <typeparam name="T">The type to convert or cast the value to.</typeparam>
+            <param name="initialValue">The value to convert.</param>
+            <param name="culture">The culture to use when converting.</param>
+            <returns>The converted type. If conversion was unsuccessful, the initial value is returned if assignable to the target type</returns>
         </member>
-        <member name="P:Newtonsoft.Json.JsonWriter.QuoteChar">
+        <member name="M:Newtonsoft.Json.Utilities.ConvertUtils.ConvertOrCast(System.Object,System.Globalization.CultureInfo,System.Type)">
             <summary>
-            Gets or sets which character to use to quote attribute values.
+            Converts the value to the specified type. If the value is unable to be converted, the
+            value is checked whether it assignable to the specified type.
             </summary>
+            <param name="initialValue">The value to convert.</param>
+            <param name="culture">The culture to use when converting.</param>
+            <param name="targetType">The type to convert or cast the value to.</param>
+            <returns>
+            The converted type. If conversion was unsuccessful, the initial value
+            is returned if assignable to the target type.
+            </returns>
         </member>
-        <member name="P:Newtonsoft.Json.JsonWriter.IndentChar">
+        <member name="M:Newtonsoft.Json.Utilities.ConvertUtils.TryConvertOrCast``1(System.Object,``0@)">
             <summary>
-            Gets or sets which character to use for indenting when <paramref name="Formatting"/> is set to <c>Formatting.Indented</c>.
+            Converts the value to the specified type. If the value is unable to be converted, the
+            value is checked whether it assignable to the specified type.
             </summary>
+            <typeparam name="T">The type to convert the value to.</typeparam>
+            <param name="initialValue">The value to convert.</param>
+            <param name="convertedValue">The converted value if the conversion was successful or the default value of <c>T</c> if it failed.</param>
+            <returns>
+                <c>true</c> if <c>initialValue</c> was converted successfully or is assignable; otherwise, <c>false</c>.
+            </returns>
         </member>
-        <member name="P:Newtonsoft.Json.JsonWriter.QuoteName">
+        <member name="M:Newtonsoft.Json.Utilities.ConvertUtils.TryConvertOrCast``1(System.Object,System.Globalization.CultureInfo,``0@)">
             <summary>
-            Gets or sets a value indicating whether object names will be surrounded with quotes.
+            Converts the value to the specified type. If the value is unable to be converted, the
+            value is checked whether it assignable to the specified type.
             </summary>
+            <typeparam name="T">The type to convert the value to.</typeparam>
+            <param name="initialValue">The value to convert.</param>
+            <param name="culture">The culture to use when converting.</param>
+            <param name="convertedValue">The converted value if the conversion was successful or the default value of <c>T</c> if it failed.</param>
+            <returns>
+                <c>true</c> if <c>initialValue</c> was converted successfully or is assignable; otherwise, <c>false</c>.
+            </returns>
         </member>
-        <member name="T:Newtonsoft.Json.JsonReader">
+        <member name="M:Newtonsoft.Json.Utilities.ConvertUtils.TryConvertOrCast(System.Object,System.Globalization.CultureInfo,System.Type,System.Object@)">
             <summary>
-            Represents a reader that provides fast, non-cached, forward-only access to serialized Json data.
+            Converts the value to the specified type. If the value is unable to be converted, the
+            value is checked whether it assignable to the specified type.
             </summary>
+            <param name="initialValue">The value to convert.</param>
+            <param name="culture">The culture to use when converting.</param>
+            <param name="targetType">The type to convert the value to.</param>
+            <param name="convertedValue">The converted value if the conversion was successful or the default value of <c>T</c> if it failed.</param>
+            <returns>
+                <c>true</c> if <c>initialValue</c> was converted successfully or is assignable; otherwise, <c>false</c>.
+            </returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonReader.#ctor(System.IO.TextReader)">
+        <member name="M:Newtonsoft.Json.Utilities.EnumUtils.Parse``1(System.String)">
             <summary>
-            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonReader"/> class with the specified <see cref="T:System.IO.TextReader"/>.
+            Parses the specified enum member name, returning it's value.
             </summary>
-            <param name="reader">The <c>TextReader</c> containing the XML data to read.</param>
+            <param name="enumMemberName">Name of the enum member.</param>
+            <returns></returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonReader.Read">
+        <member name="M:Newtonsoft.Json.Utilities.EnumUtils.Parse``1(System.String,System.Boolean)">
             <summary>
-            Reads the next Json token from the stream.
+            Parses the specified enum member name, returning it's value.
             </summary>
+            <param name="enumMemberName">Name of the enum member.</param>
+            <param name="ignoreCase">If set to <c>true</c> ignore case.</param>
             <returns></returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonReader.Close">
+        <member name="M:Newtonsoft.Json.Utilities.EnumUtils.GetNamesAndValues``1">
             <summary>
-            Changes the <see cref="T:Newtonsoft.Json.JsonReader.State"/> to Closed. 
+            Gets a dictionary of the names and values of an Enum type.
             </summary>
+            <returns></returns>
         </member>
-        <member name="P:Newtonsoft.Json.JsonReader.QuoteChar">
+        <member name="M:Newtonsoft.Json.Utilities.EnumUtils.GetNamesAndValues``2">
             <summary>
-            Gets the quotation mark character used to enclose the value of a string.
+            Gets a dictionary of the names and values of an Enum type.
             </summary>
+            <returns></returns>
         </member>
-        <member name="P:Newtonsoft.Json.JsonReader.TokenType">
+        <member name="M:Newtonsoft.Json.Utilities.EnumUtils.GetNamesAndValues``1(System.Type)">
             <summary>
-            Gets the type of the current Json token. 
+            Gets a dictionary of the names and values of an Enum type.
             </summary>
+            <param name="enumType">The enum type to get names and values for.</param>
+            <returns></returns>
         </member>
-        <member name="P:Newtonsoft.Json.JsonReader.Value">
+        <member name="M:Newtonsoft.Json.Utilities.EnumUtils.GetMaximumValue``1(System.Type)">
             <summary>
-            Gets the text value of the current Json token.
+            Gets the maximum valid value of an Enum type. Flags enums are ORed.
             </summary>
+            <typeparam name="TEnumType">The type of the returned value. Must be assignable from the enum's underlying value type.</typeparam>
+            <param name="enumType">The enum type to get the maximum value for.</param>
+            <returns></returns>
         </member>
-        <member name="P:Newtonsoft.Json.JsonReader.ValueType">
+        <member name="T:Newtonsoft.Json.JsonToken">
             <summary>
-            Gets The Common Language Runtime (CLR) type for the current Json token.
+            Specifies the type of Json token.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.None">
+            <summary>
+            This is returned by the <see cref="T:Newtonsoft.Json.JsonReader"/> if a <see cref="M:Newtonsoft.Json.JsonReader.Read"/> method has not been called. 
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.StartObject">
+            <summary>
+            An object start token.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.StartArray">
+            <summary>
+            An array start token.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.StartConstructor">
+            <summary>
+            A constructor start token.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.PropertyName">
+            <summary>
+            An object property name.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.Comment">
+            <summary>
+            A comment.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.Raw">
+            <summary>
+            Raw JSON.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.Integer">
+            <summary>
+            An interger.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.Float">
+            <summary>
+            A float.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.String">
+            <summary>
+            A string.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.Boolean">
+            <summary>
+            A boolean.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.Null">
+            <summary>
+            A null token.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.Undefined">
+            <summary>
+            An undefined token.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.EndObject">
+            <summary>
+            An object end token.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.EndArray">
+            <summary>
+            An array end token.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.EndConstructor">
+            <summary>
+            A constructor end token.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.Date">
+            <summary>
+            A Date.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.JsonToken.Bytes">
+            <summary>
+            Byte data.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.WriteState">
+            <summary>
+            Specifies the state of the <see cref="T:Newtonsoft.Json.JsonWriter"/>.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.WriteState.Error">
+            <summary>
+            An exception has been thrown, which has left the <see cref="T:Newtonsoft.Json.JsonWriter"/> in an invalid state.
+            You may call the <see cref="M:Newtonsoft.Json.JsonWriter.Close"/> method to put the <see cref="T:Newtonsoft.Json.JsonWriter"/> in the <c>Closed</c> state.
+            Any other <see cref="T:Newtonsoft.Json.JsonWriter"/> method calls results in an <see cref="T:System.InvalidOperationException"/> being thrown. 
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.WriteState.Closed">
+            <summary>
+            The <see cref="M:Newtonsoft.Json.JsonWriter.Close"/> method has been called. 
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.WriteState.Object">
+            <summary>
+            An object is being written. 
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.WriteState.Array">
+            <summary>
+            A array is being written.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.WriteState.Constructor">
+            <summary>
+            A constructor is being written.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.WriteState.Property">
+            <summary>
+            A property is being written.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.WriteState.Start">
+            <summary>
+            A write method has not been called.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Formatting">
+            <summary>
+            Specifies formatting options for the <see cref="T:Newtonsoft.Json.JsonTextWriter"/>.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Formatting.None">
+            <summary>
+            No special formatting is applied. This is the default.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Formatting.Indented">
+            <summary>
+            Causes child objects to be indented according to the <see cref="P:Newtonsoft.Json.JsonTextWriter.Indentation"/> and <see cref="P:Newtonsoft.Json.JsonTextWriter.IndentChar"/> settings.
+            </summary>
+        </member>
+        <member name="T:Newtonsoft.Json.Utilities.StringBuffer">
+            <summary>
+            Builds a string. Unlike StringBuilder this class lets you reuse it's internal buffer.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.CollectionUtils.IsNullOrEmpty(System.Collections.ICollection)">
+            <summary>
+            Determines whether the collection is null or empty.
+            </summary>
+            <param name="collection">The collection.</param>
+            <returns>
+                <c>true</c> if the collection is null or empty; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.CollectionUtils.IsNullOrEmpty``1(System.Collections.Generic.ICollection{``0})">
+            <summary>
+            Determines whether the collection is null or empty.
+            </summary>
+            <param name="collection">The collection.</param>
+            <returns>
+                <c>true</c> if the collection is null or empty; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.CollectionUtils.IsNullOrEmptyOrDefault``1(System.Collections.Generic.IList{``0})">
+            <summary>
+            Determines whether the collection is null, empty or its contents are uninitialized values.
+            </summary>
+            <param name="list">The list.</param>
+            <returns>
+                <c>true</c> if the collection is null or empty or its contents are uninitialized values; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.CollectionUtils.Slice``1(System.Collections.Generic.IList{``0},System.Nullable{System.Int32},System.Nullable{System.Int32})">
+            <summary>
+            Makes a slice of the specified list in between the start and end indexes.
+            </summary>
+            <param name="list">The list.</param>
+            <param name="start">The start index.</param>
+            <param name="end">The end index.</param>
+            <returns>A slice of the list.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.CollectionUtils.Slice``1(System.Collections.Generic.IList{``0},System.Nullable{System.Int32},System.Nullable{System.Int32},System.Nullable{System.Int32})">
+            <summary>
+            Makes a slice of the specified list in between the start and end indexes,
+            getting every so many items based upon the step.
+            </summary>
+            <param name="list">The list.</param>
+            <param name="start">The start index.</param>
+            <param name="end">The end index.</param>
+            <param name="step">The step.</param>
+            <returns>A slice of the list.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.CollectionUtils.GroupBy``2(System.Collections.Generic.ICollection{``1},System.Func{``1,``0})">
+            <summary>
+            Group the collection using a function which returns the key.
+            </summary>
+            <param name="source">The source collection to group.</param>
+            <param name="keySelector">The key selector.</param>
+            <returns>A Dictionary with each key relating to a list of objects in a list grouped under it.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.CollectionUtils.AddRange``1(System.Collections.Generic.IList{``0},System.Collections.Generic.IEnumerable{``0})">
+            <summary>
+            Adds the elements of the specified collection to the specified generic IList.
+            </summary>
+            <param name="initial">The list to add to.</param>
+            <param name="collection">The collection of elements to add.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.GetCollectionItemType(System.Type)">
+            <summary>
+            Gets the type of the typed collection's items.
+            </summary>
+            <param name="type">The type.</param>
+            <returns>The type of the typed collection's items.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.ItemsUnitializedValue``1(System.Collections.Generic.IList{``0})">
+            <summary>
+            Tests whether the list's items are their unitialized value.
+            </summary>
+            <param name="list">The list.</param>
+            <returns>Whether the list's items are their unitialized value</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.GetMemberUnderlyingType(System.Reflection.MemberInfo)">
+            <summary>
+            Gets the member's underlying type.
+            </summary>
+            <param name="member">The member.</param>
+            <returns>The underlying type of the member.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.IsIndexedProperty(System.Reflection.MemberInfo)">
+            <summary>
+            Determines whether the member is an indexed property.
+            </summary>
+            <param name="member">The member.</param>
+            <returns>
+                <c>true</c> if the member is an indexed property; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.IsIndexedProperty(System.Reflection.PropertyInfo)">
+            <summary>
+            Determines whether the property is an indexed property.
+            </summary>
+            <param name="property">The property.</param>
+            <returns>
+                <c>true</c> if the property is an indexed property; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.GetMemberValue(System.Reflection.MemberInfo,System.Object)">
+            <summary>
+            Gets the member's value on the object.
+            </summary>
+            <param name="member">The member.</param>
+            <param name="target">The target object.</param>
+            <returns>The member's value on the object.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.SetMemberValue(System.Reflection.MemberInfo,System.Object,System.Object)">
+            <summary>
+            Sets the member's value on the target object.
+            </summary>
+            <param name="member">The member.</param>
+            <param name="target">The target.</param>
+            <param name="value">The value.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.CanReadMemberValue(System.Reflection.MemberInfo)">
+            <summary>
+            Determines whether the specified MemberInfo can be read.
+            </summary>
+            <param name="member">The MemberInfo to determine whether can be read.</param>
+            <returns>
+                <c>true</c> if the specified MemberInfo can be read; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.ReflectionUtils.CanSetMemberValue(System.Reflection.MemberInfo)">
+            <summary>
+            Determines whether the specified MemberInfo can be set.
             </summary>
+            <param name="member">The MemberInfo to determine whether can be set.</param>
+            <returns>
+                <c>true</c> if the specified MemberInfo can be set; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.StringUtils.ContainsWhiteSpace(System.String)">
+            <summary>
+            Determines whether the string contains white space.
+            </summary>
+            <param name="s">The string to test for white space.</param>
+            <returns>
+                <c>true</c> if the string contains white space; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.StringUtils.IsWhiteSpace(System.String)">
+            <summary>
+            Determines whether the string is all white space. Empty string will return false.
+            </summary>
+            <param name="s">The string to test whether it is all white space.</param>
+            <returns>
+                <c>true</c> if the string is all white space; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.StringUtils.EnsureEndsWith(System.String,System.String)">
+            <summary>
+            Ensures the target string ends with the specified string.
+            </summary>
+            <param name="target">The target.</param>
+            <param name="value">The value.</param>
+            <returns>The target string with the value string at the end.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.StringUtils.IfNotNullOrEmpty(System.String,System.Action{System.String})">
+            <summary>
+            Perform an action if the string is not null or empty.
+            </summary>
+            <param name="value">The value.</param>
+            <param name="action">The action to perform.</param>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.StringUtils.Indent(System.String,System.Int32)">
+            <summary>
+            Indents the specified string.
+            </summary>
+            <param name="s">The string to indent.</param>
+            <param name="indentation">The number of characters to indent by.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.StringUtils.Indent(System.String,System.Int32,System.Char)">
+            <summary>
+            Indents the specified string.
+            </summary>
+            <param name="s">The string to indent.</param>
+            <param name="indentation">The number of characters to indent by.</param>
+            <param name="indentChar">The indent character.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.StringUtils.NumberLines(System.String)">
+            <summary>
+            Numbers the lines.
+            </summary>
+            <param name="s">The string to number.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Newtonsoft.Json.Utilities.StringUtils.NullEmptyString(System.String)">
+            <summary>
+            Nulls an empty string.
+            </summary>
+            <param name="s">The string.</param>
+            <returns>Null if the string was null, otherwise the string unchanged.</returns>
         </member>
     </members>
 </doc>
diff --git a/bin/Newtonsoft.Json.dll b/bin/Newtonsoft.Json.dll
index 3b14448..177d9b5 100644
--- a/bin/Newtonsoft.Json.dll
+++ b/bin/Newtonsoft.Json.dll
diff --git a/bin/Newtonsoft.Json.pdb b/bin/Newtonsoft.Json.pdb
index a8b8b8f..892546a 100644
--- a/bin/Newtonsoft.Json.pdb
+++ b/bin/Newtonsoft.Json.pdb
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 1a6059f..8d7c2cf 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1263,6 +1263,7 @@
     ;Include-HGStandalone = "config-include/StandaloneHypergrid.ini"
     ;Include-Grid         = "config-include/Grid.ini"
     ;Include-HGGrid       = "config-include/GridHypergrid.ini"
+    ;Include-SimianGrid   = "config-include/SimianGrid.ini"
 
     ; Then choose
     ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
new file mode 100644
index 0000000..58dcae9
--- /dev/null
+++ b/bin/config-include/SimianGrid.ini
@@ -0,0 +1,57 @@
+;;
+;; Please don't change this file.
+;; All optional settings are in GridCommon.ini.example,
+;; which you can copy and change.
+;;
+
+;;
+;; In GridCommon.ini, these are the URLs you would use if SimianGrid is 
+;; installed at http://www.mygrid.com/Grid/
+;;
+; AssetServerURI = "http://www.mygrid.com/Grid/?id="
+; InventoryServerURI = "http://www.mygrid.com/Grid/"
+; AvatarServerURI = "http://www.mygrid.com/Grid/"
+; PresenceServerURI = "http://www.mygrid.com/Grid/"
+; UserAccountServerURI = "http://www.mygrid.com/Grid/"
+; AuthenticationServerURI = "http://www.mygrid.com/Grid/"
+; FriendsServerURI = "http://www.mygrid.com/Grid/"
+
+[Includes]
+    Include-Common = "config-include/GridCommon.ini"
+
+[Modules]
+    GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
+    PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
+    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianGridUserAccountServiceConnector"
+    AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
+    AssetServices = "OpenSim.Services.Connectors.dll:SimianAssetServiceConnector"
+    InventoryServices = "OpenSim.Services.Connectors.dll:SimianInventoryServiceConnector"
+    AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
+    
+    NeighbourServices = "RemoteNeighbourServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
+    EntityTransferModule = "BasicEntityTransferModule"
+    InventoryAccessModule = "BasicInventoryAccessModule"
+    
+    LandServiceInConnector = true
+    NeighbourServiceInConnector = true
+    SimulationServiceInConnector = true
+    LibraryModule = false
+    
+    AssetCaching = "FlotsamAssetCache"
+
+[Friends]
+    Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector"
+
+[GridService]
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+
+[LibraryService]
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
+
+[AssetService]
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    AssetLoaderArgs = "assets/AssetSets.xml"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 3011370..92c2154 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -5,17 +5,18 @@
 ;;
 
 [Modules]
-    AssetServices = "LocalAssetServicesConnector"
-    InventoryServices = "LocalInventoryServicesConnector"
-    NeighbourServices = "LocalNeighbourServicesConnector"
-    AuthenticationServices = "LocalAuthenticationServicesConnector"
-    GridServices = "LocalGridServicesConnector"
-    PresenceServices = "LocalPresenceServicesConnector"
-    UserAccountServices = "LocalUserAccountServicesConnector"
-    SimulationServices = "LocalSimulationConnectorModule"
-    AvatarServices = "LocalAvatarServicesConnector"
-    EntityTransferModule = "BasicEntityTransferModule"
-    InventoryAccessModule = "BasicInventoryAccessModule"
+    AssetServices           = "LocalAssetServicesConnector"
+    InventoryServices       = "LocalInventoryServicesConnector"
+    NeighbourServices       = "LocalNeighbourServicesConnector"
+    AuthenticationServices  = "LocalAuthenticationServicesConnector"
+    GridServices            = "LocalGridServicesConnector"
+    PresenceServices        = "LocalPresenceServicesConnector"
+    UserAccountServices     = "LocalUserAccountServicesConnector"
+    GridUserServices        = "LocalGridUserServicesConnector"
+    SimulationServices      = "LocalSimulationConnectorModule"
+    AvatarServices          = "LocalAvatarServicesConnector"
+    EntityTransferModule    = "BasicEntityTransferModule"
+    InventoryAccessModule   = "BasicInventoryAccessModule"
     LibraryModule = true
     LLLoginServiceInConnector = true
 
@@ -32,14 +33,12 @@
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
-    ConnectionString = "URI=file:avatars.db,version=3"
 
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    ConnectionString = "URI=file:auth.db,version=3"
 
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
@@ -52,7 +51,6 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ConnectionString = "URI=file:userprofiles.db,version=3"
 
     ;; These are for creating new accounts
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@@ -60,22 +58,24 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
 
+[GridUserService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
+
 [FriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll"
-    ConnectionString = "URI=file:friends.db,version=3"
 
 [Friends]
     Connector = "OpenSim.Services.FriendsService.dll"
 
 [LoginService]
-    LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
-    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
-    GridService = "OpenSim.Services.GridService.dll:GridService"
-    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
-    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+    InventoryService      = "OpenSim.Services.InventoryService.dll:InventoryService"
+    PresenceService       = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService           = "OpenSim.Services.GridService.dll:GridService"
+    AvatarService         = "OpenSim.Services.AvatarService.dll:AvatarService"
+    FriendsService        = "OpenSim.Services.FriendsService.dll:FriendsService"
 
     WelcomeMessage = "Welcome, Avatar!"
 
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8e21a8c..f89c67a 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,19 +1,24 @@
+; This is the main configuration file for standalone OpenSim instances
+
 [DatabaseService]
     ;
-    ;### Choose the DB
+    ; ### Choose the DB
     ;
-    ;--- For SQLite
-    StorageProvider = "OpenSim.Data.SQLite.dll"
-    ;--- For MySql
+
+    ; SQLite
+    ; Uncomment this line if you want to use sqlite storage
+    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+
+    ; For 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=***;"
 
 [AssetService]
-
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
-
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
@@ -35,10 +40,10 @@
 
 [GridService]
     ;; For in-memory region storage (default)
-        StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+          StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
     ;;--- For MySql region storage (alternative)
-        ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
-        ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+          ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+
     ;; 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
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
new file mode 100644
index 0000000..1ce0357
--- /dev/null
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -0,0 +1,16 @@
+; These are the initialization settings for running OpenSim Standalone with an SQLite database
+
+[DatabaseService]
+    StorageProvider = "OpenSim.Data.SQLite.dll"
+
+[AvatarService]
+    ConnectionString = "URI=file:avatars.db,version=3"
+
+[AuthenticationService]
+    ConnectionString = "URI=file:auth.db,version=3"
+
+[UserAccountService]
+    ConnectionString = "URI=file:userprofiles.db,version=3"
+
+[FriendsService]
+    ConnectionString = "URI=file:friends.db,version=3"
diff --git a/bin/libbulletnet.dll b/bin/libbulletnet.dll
index 3edd005..8ec7c55 100644
--- a/bin/libbulletnet.dll
+++ b/bin/libbulletnet.dll
diff --git a/prebuild.xml b/prebuild.xml
index 6850b50..bfd6bbd 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -959,7 +959,9 @@
       <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="Mono.Addins" />
       <Reference name="Nini.dll" />
       <Reference name="log4net.dll"/>
       <Reference name="XMLRPC.dll" />