36 files changed, 3700 insertions, 3655 deletions

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 5a23c90..13f9c9f 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1611,7 +1611,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                 GridRegion home = m_app.SceneManager.CurrentOrFirstScene.GridService.GetRegionByPosition(scopeID, 
                                     (int)(regX * Constants.RegionSize), (int)(regY * Constants.RegionSize));
                                 if (home != null)
-                                    m_app.SceneManager.CurrentOrFirstScene.PresenceService.SetHomeLocation(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
+                                    m_app.SceneManager.CurrentOrFirstScene.GridUserService.SetHome(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
                             }
                             else
                             {
diff --git a/OpenSim/Data/IGridUserData.cs b/OpenSim/Data/IGridUserData.cs
index bd7a435..e15a1f8 100644
--- a/OpenSim/Data/IGridUserData.cs
+++ b/OpenSim/Data/IGridUserData.cs
@@ -37,6 +37,11 @@ namespace OpenSim.Data
     {
         public string UserID;
         public Dictionary<string, string> Data;
+
+        public GridUserData()
+        {
+            Data = new Dictionary<string, string>();
+        }
     }
 
     /// <summary>
@@ -44,7 +49,7 @@ namespace OpenSim.Data
     /// </summary>
     public interface IGridUserData 
     {
-        GridUserData GetGridUserData(string userID);
-        bool StoreGridUserData(GridUserData data);
+        GridUserData Get(string userID);
+        bool Store(GridUserData data);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/IPresenceData.cs b/OpenSim/Data/IPresenceData.cs
index 71d0e31..b871f56 100644
--- a/OpenSim/Data/IPresenceData.cs
+++ b/OpenSim/Data/IPresenceData.cs
@@ -50,10 +50,8 @@ namespace OpenSim.Data
 
         PresenceData Get(UUID sessionID);
         void LogoutRegionAgents(UUID regionID);
-        bool ReportAgent(UUID sessionID, UUID regionID, string position, string lookAt);
-        bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt);
+        bool ReportAgent(UUID sessionID, UUID regionID);
         PresenceData[] Get(string field, string data);
-        void Prune(string userID);
         bool Delete(string field, string val);
     }
 }
diff --git a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
index 9993720..1870273 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
@@ -46,11 +46,11 @@ namespace OpenSim.Data.MSSQL
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public MSSQLGridUserData(string connectionString, string realm) :
-            base(connectionString, realm, "UserGrid")
+            base(connectionString, realm, "GridUserStore")
         {
         }
 
-        public GridUserData GetGridUserData(string userID)
+        public GridUserData Get(string userID)
         {
             GridUserData[] ret = Get("UserID", userID);
 
@@ -60,9 +60,5 @@ namespace OpenSim.Data.MSSQL
             return ret[0];
         }
 
-        public bool StoreGridUserData(GridUserData data)
-        {
-            return Store(data);
-        }
     }
 }
diff --git a/OpenSim/Data/MSSQL/MSSQLPresenceData.cs b/OpenSim/Data/MSSQL/MSSQLPresenceData.cs
index 5a4ad3a..e7b3d9c 100644
--- a/OpenSim/Data/MSSQL/MSSQLPresenceData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLPresenceData.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Data.MSSQL
             using (SqlCommand cmd = new SqlCommand())
             {
 
-                cmd.CommandText = String.Format("UPDATE {0} SET Online='false' WHERE [RegionID]=@RegionID", m_Realm);
+                cmd.CommandText = String.Format("DELETE FROM {0} WHERE [RegionID]=@RegionID", m_Realm);
 
                 cmd.Parameters.Add(m_database.CreateParameter("@RegionID", regionID.ToString()));
                 cmd.Connection = conn;
@@ -76,8 +76,7 @@ namespace OpenSim.Data.MSSQL
             }
         }
 
-        public bool ReportAgent(UUID sessionID, UUID regionID, string position,
-                string lookAt)
+        public bool ReportAgent(UUID sessionID, UUID regionID)
         {
             PresenceData[] pd = Get("SessionID", sessionID.ToString());
             if (pd.Length == 0)
@@ -88,16 +87,11 @@ namespace OpenSim.Data.MSSQL
             {
 
                 cmd.CommandText = String.Format(@"UPDATE {0} SET 
-                                                [RegionID] = @RegionID, 
-                                                [Position] = @Position, 
-                                                [LookAt] = @LookAt, 
-                                                [Online] = 'true'
+                                                [RegionID] = @RegionID
                                         WHERE [SessionID] = @SessionID", m_Realm);
 
                 cmd.Parameters.Add(m_database.CreateParameter("@SessionID", sessionID.ToString()));
                 cmd.Parameters.Add(m_database.CreateParameter("@RegionID", regionID.ToString()));
-                cmd.Parameters.Add(m_database.CreateParameter("@Position", position.ToString()));
-                cmd.Parameters.Add(m_database.CreateParameter("@LookAt", lookAt.ToString()));
                 cmd.Connection = conn;
                 conn.Open();
                 if (cmd.ExecuteNonQuery() == 0)
@@ -106,65 +100,5 @@ namespace OpenSim.Data.MSSQL
             return true;
         }
 
-        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
-        {
-            PresenceData[] pd = Get("UserID", userID);
-            if (pd.Length == 0)
-                return false;
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
-            {
-
-                cmd.CommandText = String.Format(@"UPDATE {0} SET 
-                                                [HomeRegionID] = @HomeRegionID, 
-                                                [HomePosition] = @HomePosition, 
-                                                [HomeLookAt] = @HomeLookAt 
-                                            WHERE [UserID] = @UserID", m_Realm);
-
-                cmd.Parameters.Add(m_database.CreateParameter("@UserID", userID));
-                cmd.Parameters.Add(m_database.CreateParameter("@HomeRegionID", regionID.ToString()));
-                cmd.Parameters.Add(m_database.CreateParameter("@HomePosition", position));
-                cmd.Parameters.Add(m_database.CreateParameter("@HomeLookAt", lookAt));
-                cmd.Connection = conn;
-                conn.Open();
-                if (cmd.ExecuteNonQuery() == 0)
-                    return false;
-            }
-            return true;
-        }
-
-        public void Prune(string userID)
-        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
-            {
-                cmd.CommandText = String.Format("SELECT * from {0} WHERE [UserID] = @UserID", m_Realm);
-
-                cmd.Parameters.Add(m_database.CreateParameter("@UserID", userID));
-                cmd.Connection = conn;
-                conn.Open();
-
-                using (SqlDataReader reader = cmd.ExecuteReader())
-                {
-                    List<UUID> deleteSessions = new List<UUID>();
-                    int online = 0;
-
-                    while (reader.Read())
-                    {
-                        if (bool.Parse(reader["Online"].ToString()))
-                            online++;
-                        else
-                            deleteSessions.Add(new UUID(reader["SessionID"].ToString()));
-                    }
-
-                    if (online == 0 && deleteSessions.Count > 0)
-                        deleteSessions.RemoveAt(0);
-
-                    foreach (UUID s in deleteSessions)
-                        Delete("SessionID", s.ToString());
-                }
-            }
-        }
     }
 }
diff --git a/OpenSim/Data/MySQL/MySQLGridUserData.cs b/OpenSim/Data/MySQL/MySQLGridUserData.cs
index df29ecd..a9ce94d 100644
--- a/OpenSim/Data/MySQL/MySQLGridUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridUserData.cs
@@ -44,9 +44,9 @@ namespace OpenSim.Data.MySQL
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public MySQLGridUserData(string connectionString, string realm) : base(connectionString, realm, "UserGrid") {}
+        public MySQLGridUserData(string connectionString, string realm) : base(connectionString, realm, "GridUserStore") {}
 
-        public GridUserData GetGridUserData(string userID)
+        public GridUserData Get(string userID)
         {
             GridUserData[] ret = Get("UserID", userID);
 
@@ -56,9 +56,6 @@ namespace OpenSim.Data.MySQL
             return ret[0];
         }
 
-        public bool StoreGridUserData(GridUserData data)
-        {
-            return Store(data);
-        }
+
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/MySQLPresenceData.cs b/OpenSim/Data/MySQL/MySQLPresenceData.cs
index 143dbe3..71caa1a 100644
--- a/OpenSim/Data/MySQL/MySQLPresenceData.cs
+++ b/OpenSim/Data/MySQL/MySQLPresenceData.cs
@@ -65,15 +65,14 @@ namespace OpenSim.Data.MySQL
         {
             MySqlCommand cmd = new MySqlCommand();
 
-            cmd.CommandText = String.Format("update {0} set Online='false' where `RegionID`=?RegionID", m_Realm);
+            cmd.CommandText = String.Format("delete from {0} where `RegionID`=?RegionID", m_Realm);
 
             cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
 
             ExecuteNonQuery(cmd);
         }
 
-        public bool ReportAgent(UUID sessionID, UUID regionID, string position,
-                string lookAt)
+        public bool ReportAgent(UUID sessionID, UUID regionID)
         {
             PresenceData[] pd = Get("SessionID", sessionID.ToString());
             if (pd.Length == 0)
@@ -81,12 +80,10 @@ namespace OpenSim.Data.MySQL
 
             MySqlCommand cmd = new MySqlCommand();
 
-            cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, Position=?Position, LookAt=?LookAt, Online='true' where `SessionID`=?SessionID", m_Realm);
+            cmd.CommandText = String.Format("update {0} set RegionID=?RegionID where `SessionID`=?SessionID", m_Realm);
 
             cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString());
             cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-            cmd.Parameters.AddWithValue("?Position", position.ToString());
-            cmd.Parameters.AddWithValue("?LookAt", lookAt.ToString());
 
             if (ExecuteNonQuery(cmd) == 0)
                 return false;
@@ -94,62 +91,5 @@ namespace OpenSim.Data.MySQL
             return true;
         }
 
-        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
-        {
-            PresenceData[] pd = Get("UserID", userID);
-            if (pd.Length == 0)
-                return false;
-
-            MySqlCommand cmd = new MySqlCommand();
-
-            cmd.CommandText = String.Format("update {0} set HomeRegionID=?HomeRegionID, HomePosition=?HomePosition, HomeLookAt=?HomeLookAt where UserID=?UserID", m_Realm);
-
-            cmd.Parameters.AddWithValue("?UserID", userID);
-            cmd.Parameters.AddWithValue("?HomeRegionID", regionID.ToString());
-            cmd.Parameters.AddWithValue("?HomePosition", position);
-            cmd.Parameters.AddWithValue("?HomeLookAt", lookAt);
-
-            if (ExecuteNonQuery(cmd) == 0)
-                return false;
-
-            return true;
-        }
-
-        public void Prune(string userID)
-        {
-            MySqlCommand cmd = new MySqlCommand();
-
-            cmd.CommandText = String.Format("select * from {0} where UserID=?UserID", m_Realm);
-
-            cmd.Parameters.AddWithValue("?UserID", userID);
-
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-            { 
-                dbcon.Open();
-
-                cmd.Connection = dbcon;
-
-                using (IDataReader reader = cmd.ExecuteReader())
-                {
-                    List<UUID> deleteSessions = new List<UUID>();
-                    int online = 0;
-
-                    while (reader.Read())
-                    {
-                        if (bool.Parse(reader["Online"].ToString()))
-                            online++;
-                        else
-                            deleteSessions.Add(new UUID(reader["SessionID"].ToString()));
-                    }
-
-                    // Leave one session behind so that we can pick up details such as home location
-                    if (online == 0 && deleteSessions.Count > 0)
-                        deleteSessions.RemoveAt(0);
-
-                    foreach (UUID s in deleteSessions)
-                        Delete("SessionID", s.ToString());
-                }
-            }
-        }
     }
 }
diff --git a/OpenSim/Data/MySQL/Resources/001_Presence.sql b/OpenSim/Data/MySQL/Resources/001_Presence.sql
index b8abaf7..84fa057 100644
--- a/OpenSim/Data/MySQL/Resources/001_Presence.sql
+++ b/OpenSim/Data/MySQL/Resources/001_Presence.sql
@@ -4,12 +4,10 @@ CREATE TABLE `Presence` (
     `UserID` VARCHAR(255) NOT NULL,
     `RegionID` CHAR(36) NOT NULL,
     `SessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-    `SecureSessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-    `Online` CHAR(5) NOT NULL DEFAULT 'false',
-    `Login` CHAR(16) NOT NULL DEFAULT '0',
-    `Logout` CHAR(16) NOT NULL DEFAULT '0',
-    `Position` CHAR(64) NOT NULL DEFAULT '<0,0,0>',
-    `LookAt` CHAR(64) NOT NULL DEFAULT '<0,0,0>'
+    `SecureSessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'
 ) ENGINE=InnoDB;
 
+CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
+CREATE INDEX UserID ON Presence(UserID);
+
 COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/002_Presence.sql b/OpenSim/Data/MySQL/Resources/002_Presence.sql
deleted file mode 100644
index e65f105..0000000
--- a/OpenSim/Data/MySQL/Resources/002_Presence.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-BEGIN;
-
-ALTER TABLE Presence ADD COLUMN `HomeRegionID` CHAR(36) NOT NULL;
-ALTER TABLE Presence ADD COLUMN `HomePosition` CHAR(64) NOT NULL DEFAULT '<0,0,0>';
-ALTER TABLE Presence ADD COLUMN `HomeLookAt` CHAR(64) NOT NULL DEFAULT '<0,0,0>';
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/003_Presence.sql b/OpenSim/Data/MySQL/Resources/003_Presence.sql
deleted file mode 100644
index 0efefa8..0000000
--- a/OpenSim/Data/MySQL/Resources/003_Presence.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN;
-
-CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
-CREATE INDEX UserID ON Presence(UserID);
-
-COMMIT;
diff --git a/OpenSim/Data/Null/NullPresenceData.cs b/OpenSim/Data/Null/NullPresenceData.cs
index b98b5c9..91f1cc5 100644
--- a/OpenSim/Data/Null/NullPresenceData.cs
+++ b/OpenSim/Data/Null/NullPresenceData.cs
@@ -96,45 +96,20 @@ namespace OpenSim.Data.Null
                 m_presenceData.Remove(u);
         }
 
-        public bool ReportAgent(UUID sessionID, UUID regionID, string position, string lookAt)
+        public bool ReportAgent(UUID sessionID, UUID regionID)
         {
             if (Instance != this)
-                return Instance.ReportAgent(sessionID, regionID, position, lookAt);
+                return Instance.ReportAgent(sessionID, regionID);
             
             if (m_presenceData.ContainsKey(sessionID))
             {
                 m_presenceData[sessionID].RegionID = regionID;
-                m_presenceData[sessionID].Data["Position"] = position;
-                m_presenceData[sessionID].Data["LookAt"] = lookAt;
                 return true;
             }
 
             return false;
         }
 
-        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
-        {
-            if (Instance != this)
-                return Instance.SetHomeLocation(userID, regionID, position, lookAt);
-
-            bool foundone = false;
-            foreach (PresenceData p in m_presenceData.Values)
-            {
-                if (p.UserID == userID)
-                {
-//                    m_log.DebugFormat(
-//                        "[NULL PRESENCE DATA]: Setting home location {0} {1} {2} for {3}", 
-//                        regionID, position, lookAt, p.UserID);
-
-                    p.Data["HomeRegionID"] = regionID.ToString();
-                    p.Data["HomePosition"] = position.ToString();
-                    p.Data["HomeLookAt"] = lookAt.ToString();
-                    foundone = true;
-                }
-            }
-
-            return foundone;
-        }
 
         public PresenceData[] Get(string field, string data)
         {
@@ -193,39 +168,6 @@ namespace OpenSim.Data.Null
             return presences.ToArray();
         }
 
-        public void Prune(string userID)
-        {
-            if (Instance != this)
-            {
-                Instance.Prune(userID);
-                return;
-            }
-
-//            m_log.DebugFormat("[NULL PRESENCE DATA]: Prune called for {0}", userID);
-
-            List<UUID> deleteSessions = new List<UUID>();
-            int online = 0;
-
-            foreach (KeyValuePair<UUID, PresenceData> kvp in m_presenceData)
-            {
-//                m_log.DebugFormat("Online: {0}", kvp.Value.Data["Online"]);
-                
-                bool on = false;
-                if (bool.TryParse(kvp.Value.Data["Online"], out on) && on)
-                    online++;
-                else
-                    deleteSessions.Add(kvp.Key);
-            }
-
-//            m_log.DebugFormat("[NULL PRESENCE DATA]: online [{0}], deleteSession.Count [{1}]", online, deleteSessions.Count);
-
-            // Leave one session behind so that we can pick up details such as home location
-            if (online == 0 && deleteSessions.Count > 0)
-                deleteSessions.RemoveAt(0);
-
-            foreach (UUID s in deleteSessions)
-                m_presenceData.Remove(s);
-        }
 
         public bool Delete(string field, string data)
         {
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index f2b03e4..ef37f63 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -526,11 +526,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         {
             m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.FirstName, client.LastName);
 
-            OpenSim.Services.Interfaces.PresenceInfo pinfo = m_aScene.PresenceService.GetAgent(client.SessionId);
+            //OpenSim.Services.Interfaces.PresenceInfo pinfo = m_aScene.PresenceService.GetAgent(client.SessionId);
+            GridUserInfo uinfo = m_aScene.GridUserService.GetGridUserInfo(client.AgentId.ToString());
 
-            if (pinfo != null)
+            if (uinfo != null)
             {
-                GridRegion regionInfo = m_aScene.GridService.GetRegionByUUID(UUID.Zero, pinfo.HomeRegionID);
+                GridRegion regionInfo = m_aScene.GridService.GetRegionByUUID(UUID.Zero, uinfo.HomeRegionID);
                 if (regionInfo == null)
                 {
                     // can't find the Home region: Tell viewer and abort
@@ -539,7 +540,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 }
                 // a little eekie that this goes back to Scene and with a forced cast, will fix that at some point...
                 ((Scene)(client.Scene)).RequestTeleportLocation(
-                    client, regionInfo.RegionHandle, pinfo.HomePosition, pinfo.HomeLookAt,
+                    client, regionInfo.RegionHandle, uinfo.HomePosition, uinfo.HomeLookAt,
                     (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
             }
         }
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 28593fc..137dfec 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -154,7 +154,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     bool success = connector.LoginAgentToGrid(agentCircuit, reg, finalDestination, out reason);
                     if (success)
                         // Log them out of this grid
-                        m_aScene.PresenceService.LogoutAgent(agentCircuit.SessionID, sp.AbsolutePosition, sp.Lookat);
+                        m_aScene.PresenceService.LogoutAgent(agentCircuit.SessionID);
 
                     return success;
                 }
@@ -238,6 +238,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         {
             if (obj.IsLoggingOut)
             {
+                object sp = null;
+                if (obj.Scene.TryGetScenePresence(obj.AgentId, out sp))
+                {
+                    if (((ScenePresence)sp).IsChildAgent)
+                        return;
+                }
+
                 AgentCircuitData aCircuit = ((Scene)(obj.Scene)).AuthenticateHandler.GetAgentCircuitData(obj.CircuitCode);
 
                 if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 0a5ff3f..ee07075 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -59,9 +59,11 @@
         <RegionModule id="RemoteUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.RemoteUserAccountServicesConnector" />
         
         <RegionModule id="LocalGridUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser.LocalGridUserServicesConnector" />
-        
+        <RegionModule id="RemoteGridUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser.RemoteGridUserServicesConnector" />
+
         <RegionModule id="LocalSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.LocalSimulationConnectorModule" />
         <RegionModule id="RemoteSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.RemoteSimulationConnectorModule" />
+      
       <!-- Service connectors IN modules -->
         <RegionModule id="AssetServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset.AssetServiceInConnectorModule" />
         <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" />
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs
index d5fae23..d914a57 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs
@@ -41,13 +41,19 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
 {
     public class LocalGridUserServicesConnector : ISharedRegionModule, IGridUserService
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
 
-        private IGridUserService m_service;
+        private IGridUserService m_GridUserService;
+
+        private ActivityDetector m_ActivityDetector;
 
         private bool m_Enabled = false;
 
-        public Type ReplaceableInterface 
+        #region ISharedRegionModule
+
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -68,7 +74,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
                     IConfig userConfig = source.Configs["GridUserService"];
                     if (userConfig == null)
                     {
-                        m_log.Error("[LOCAL GRID USER SERVICE CONNECTOR]: GridUserService missing from ini files");
+                        m_log.Error("[LOCAL GRID USER SERVICE CONNECTOR]: GridUserService missing from OpenSim.ini");
                         return;
                     }
 
@@ -81,15 +87,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
                     }
 
                     Object[] args = new Object[] { source };
-                    m_service = ServerUtils.LoadPlugin<IGridUserService>(serviceDll, args);
+                    m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(serviceDll, args);
 
-                    if (m_service == null)
+                    if (m_GridUserService == null)
                     {
-                        m_log.Error("[LOCAL GRID USER SERVICE CONNECTOR]: Can't load GridUser service");
+                        m_log.ErrorFormat(
+                            "[LOCAL GRID USER SERVICE CONNECTOR]: Cannot load user account service specified as {0}", serviceDll);
                         return;
                     }
+
+                    m_ActivityDetector = new ActivityDetector(this);
+
                     m_Enabled = true;
-                    m_log.Info("[LOCAL GRID USER SERVICE CONNECTOR]: Local GridUser connector enabled");
+
+                    m_log.Info("[LOCAL GRID USER SERVICE CONNECTOR]: Local grid user connector enabled");
                 }
             }
         }
@@ -111,29 +122,57 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
             if (!m_Enabled)
                 return;
 
-            scene.RegisterModuleInterface<IGridUserService>(m_service);
+            scene.RegisterModuleInterface<IGridUserService>(m_GridUserService);
+            m_ActivityDetector.AddRegion(scene);
         }
 
         public void RemoveRegion(Scene scene)
         {
             if (!m_Enabled)
                 return;
+
+            scene.UnregisterModuleInterface<IGridUserService>(this);
+            m_ActivityDetector.RemoveRegion(scene);
         }
 
         public void RegionLoaded(Scene scene)
         {
             if (!m_Enabled)
                 return;
+
+            m_log.InfoFormat("[LOCAL GRID USER SERVICE CONNECTOR]: Enabled local grid user for region {0}", scene.RegionInfo.RegionName);
         }
 
-        public GridUserInfo GetGridUserInfo(string userID)
+        #endregion
+
+        #region IGridUserService
+
+        public GridUserInfo LoggedIn(string userID)
         {
-            return m_service.GetGridUserInfo(userID);
+            return m_GridUserService.LoggedIn(userID);
         }
-        
-        public bool StoreGridUserInfo(GridUserInfo info)
+
+        public bool LoggedOut(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
         {
-            return m_service.StoreGridUserInfo(info);
+            return m_GridUserService.LoggedOut(userID, regionID, lastPosition, lastLookAt);
         }
+
+        public bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt)
+        {
+            return m_GridUserService.SetHome(userID, homeID, homePosition, homeLookAt);
+        }
+
+        public bool SetLastPosition(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
+        {
+            return m_GridUserService.SetLastPosition(userID, regionID, lastPosition, lastLookAt);
+        }
+
+        public GridUserInfo GetGridUserInfo(string userID)
+        {
+            return m_GridUserService.GetGridUserInfo(userID);
+        }
+
+        #endregion
+
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
index c402a3f..49dd633 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
@@ -167,9 +167,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
             return false;
         }
 
-        public bool LogoutAgent(UUID sessionID, Vector3 position, Vector3 lookat)
+        public bool LogoutAgent(UUID sessionID)
         {
-            return m_PresenceService.LogoutAgent(sessionID, position, lookat);
+            return m_PresenceService.LogoutAgent(sessionID);
         }
 
 
@@ -178,9 +178,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
             return m_PresenceService.LogoutRegionAgents(regionID);
         }
 
-        public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
+        public bool ReportAgent(UUID sessionID, UUID regionID)
         {
-            return m_PresenceService.ReportAgent(sessionID, regionID, position, lookAt);
+            return m_PresenceService.ReportAgent(sessionID, regionID);
         }
 
         public PresenceInfo GetAgent(UUID sessionID)
@@ -193,11 +193,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
             return m_PresenceService.GetAgents(userIDs);
         }
 
-        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
-        {
-            return m_PresenceService.SetHomeLocation(userID, regionID, position, lookAt);
-        }
-
         #endregion
 
     }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
index 7a75a89..62b8278 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
         public void OnMakeRootAgent(ScenePresence sp)
         {
             m_log.DebugFormat("[PRESENCE DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName);
-            m_PresenceService.ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
+            m_PresenceService.ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID);
         }
 
         public void OnNewClient(IClientAPI client)
@@ -85,19 +85,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
             if (client.IsLoggingOut)
             {
                 object sp = null;
-                Vector3 position = new Vector3(128, 128, 0);
-                Vector3 lookat = new Vector3(0, 1, 0);
-
                 if (client.Scene.TryGetScenePresence(client.AgentId, out sp))
                 {
                     if (sp is ScenePresence)
                     {
-                        position = ((ScenePresence)sp).AbsolutePosition;
-                        lookat = ((ScenePresence)sp).Lookat;
+                        if (((ScenePresence)sp).IsChildAgent)
+                            return;
                     }
                 }
 
-                m_PresenceService.LogoutAgent(client.SessionId, position, lookat);
+                m_log.DebugFormat("[PRESENCE DETECTOR]: Detected client logout {0} in {1}", client.AgentId, client.Scene.RegionInfo.RegionName);
+                m_PresenceService.LogoutAgent(client.SessionId);
             }
 
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
index 5f3666e..bf4e9ab 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
@@ -127,9 +127,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
             return false;
         }
 
-        public bool LogoutAgent(UUID sessionID, Vector3 position, Vector3 lookat)
+        public bool LogoutAgent(UUID sessionID)
         {
-            return m_RemoteConnector.LogoutAgent(sessionID, position, lookat);
+            return m_RemoteConnector.LogoutAgent(sessionID);
         }
 
 
@@ -138,9 +138,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
             return m_RemoteConnector.LogoutRegionAgents(regionID);
         }
 
-        public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
+        public bool ReportAgent(UUID sessionID, UUID regionID)
         {
-            return m_RemoteConnector.ReportAgent(sessionID, regionID, position, lookAt);
+            return m_RemoteConnector.ReportAgent(sessionID, regionID);
         }
 
         public PresenceInfo GetAgent(UUID sessionID)
@@ -153,11 +153,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
             return m_RemoteConnector.GetAgents(userIDs);
         }
 
-        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
-        {
-            return m_RemoteConnector.SetHomeLocation(userID, regionID, position, lookAt);
-        }
-
         #endregion
 
     }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
index 63a28fc..e5ded5b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
@@ -93,24 +93,24 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests
             Assert.IsTrue(result.Online, "Agent just logged in but is offline");
 
             UUID region1 = UUID.Random();
-            bool r = m_LocalConnector.ReportAgent(session1, region1, Vector3.Zero, Vector3.Zero);
+            bool r = m_LocalConnector.ReportAgent(session1, region1);
             Assert.IsTrue(r, "First ReportAgent returned false");
             result = m_LocalConnector.GetAgent(session1);
             Assert.That(result.RegionID, Is.EqualTo(region1), "Agent is not in the right region (region1)");
 
             UUID region2 = UUID.Random();
-            r = m_LocalConnector.ReportAgent(session1, region2, Vector3.Zero, Vector3.Zero);
+            r = m_LocalConnector.ReportAgent(session1, region2);
             Assert.IsTrue(r, "Second ReportAgent returned false");
             result = m_LocalConnector.GetAgent(session1);
             Assert.That(result.RegionID, Is.EqualTo(region2), "Agent is not in the right region (region2)");
 
-            r = m_LocalConnector.LogoutAgent(session1, Vector3.Zero, Vector3.UnitY);
+            r = m_LocalConnector.LogoutAgent(session1);
             Assert.IsTrue(r, "LogoutAgent returned false");
             result = m_LocalConnector.GetAgent(session1);
             Assert.IsNotNull(result, "Agent session disappeared from storage after logout");
             Assert.IsFalse(result.Online, "Agent is reported to be Online after logout");
 
-            r = m_LocalConnector.ReportAgent(session1, region1, Vector3.Zero, Vector3.Zero);
+            r = m_LocalConnector.ReportAgent(session1, region1);
             Assert.IsFalse(r, "ReportAgent of non-logged in user returned true");
         }
     }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 1a46837..c0fa7b4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -304,7 +304,18 @@ namespace OpenSim.Region.Framework.Scenes
                 return m_AvatarService;
             }
         }
-        
+
+        protected IGridUserService m_GridUserService;
+        public IGridUserService GridUserService
+        {
+            get
+            {
+                if (m_GridUserService == null)
+                    m_GridUserService = RequestModuleInterface<IGridUserService>();
+                return m_GridUserService;
+            }
+        }
+
         protected IXMLRPC m_xmlrpcModule;
         protected IWorldComm m_worldCommModule;
         public IAttachmentsModule AttachmentsModule { get; set; }
@@ -1306,8 +1317,8 @@ namespace OpenSim.Region.Framework.Scenes
                             if (defaultRegions != null && defaultRegions.Count >= 1)
                                 home = defaultRegions[0];
 
-                            if (PresenceService != null && home != null)
-                                PresenceService.SetHomeLocation(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
+                            if (GridUserService != null && home != null)
+                                GridUserService.SetHome(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
                             else
                                 m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to set home for account {0} {1}.",
                                    first, last);
@@ -3095,7 +3106,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="flags"></param>
         public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags)
         {
-            if (PresenceService.SetHomeLocation(remoteClient.AgentId.ToString(), RegionInfo.RegionID, position, lookAt))
+            if (GridUserService != null && GridUserService.SetHome(remoteClient.AgentId.ToString(), RegionInfo.RegionID, position, lookAt))
                 // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot.
                 m_dialogModule.SendAlertToUser(remoteClient, "Home position set.");
             else
@@ -3543,7 +3554,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             OpenSim.Services.Interfaces.PresenceInfo pinfo = presence.GetAgent(agent.SessionID);
 
-            if (pinfo == null || (pinfo != null && pinfo.Online == false))
+            if (pinfo == null)
             {
                 reason = String.Format("Failed to verify user {0} {1}, access denied to region {2}.", agent.firstname, agent.lastname, RegionInfo.RegionName);
                 return false;
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
index b4e101a..53022ad 100644
--- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs
+++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
@@ -1,2284 +1,2284 @@
-/*

- * 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 int outerFaceNumber = -1;

-        internal int hollowFaceNumber = -1;

-

-        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)

-            {

-                int lastOuterVertIndex = this.numOuterVerts - 1;

-

-                if (hasHollow)

-                {

-                    this.cut1CoordIndices.Add(0);

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

-

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

-                    this.cut2CoordIndices.Add(lastOuterVertIndex);

-

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

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

-

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

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

-                }

-

-                else

-                {

-                    this.cut1CoordIndices.Add(0);

-                    this.cut1CoordIndices.Add(1);

-

-                    this.cut2CoordIndices.Add(lastOuterVertIndex);

-                    this.cut2CoordIndices.Add(0);

-

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

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

-

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

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

-

-                }

-                this.cutNormal1.Normalize();

-                this.cutNormal2.Normalize();

-            }

-

-            this.MakeFaceUVs();

-

-            hollowCoords = null;

-            hollowNormals = null;

-            hollowUs = null;

-

-            if (calcVertexNormals)

-            { // calculate prim face numbers

-

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

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

-

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

-                this.outerFaceNumber = faceNum;

-

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

-                if (startVert > 0)

-                    this.faceNumbers.Add(-1);

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

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

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

-

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

-                //    this.bottomFaceNumber = faceNum++;

-

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

-

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

-                    faceNum++;

-

-                if (sides < 5 && (hasHollow || hasProfileCut) && this.numOuterVerts < sides)

-                    faceNum++;

-

-                if (hasHollow)

-                {

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

-                        this.faceNumbers.Add(faceNum);

-

-                    this.hollowFaceNumber = faceNum++;

-                }

-                //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 int profileOuterFaceNumber = -1;

-        private int profileHollowFaceNumber = -1;

-

-        private bool hasProfileCut = false;

-        private bool hasHollow = false;

-        public bool calcVertexNormals = false;

-        private bool normalsProcessed = false;

-        public bool viewerMode = false;

-        public bool sphereMode = false;

-

-        public int numPrimFaces = 0;

-

-        /// <summary>

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

-        /// </summary>

-        /// <returns></returns>

-        public string ParamsToDisplayString()

-        {

-            string s = "";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-            s += "\nsphereMode...........: " + this.sphereMode.ToString();

-            s += "\nhasProfileCut........: " + this.hasProfileCut.ToString();

-            s += "\nhasHollow............: " + this.hasHollow.ToString();

-            s += "\nviewerMode...........: " + this.viewerMode.ToString();

-

-            return s;

-        }

-

-        public int ProfileOuterFaceNumber

-        {

-            get { return profileOuterFaceNumber; }

-        }

-

-        public int ProfileHollowFaceNumber

-        {

-            get { return profileHollowFaceNumber; }

-        }

-

-        public bool HasProfileCut

-        {

-            get { return hasProfileCut; }

-        }

-

-        public bool HasHollow

-        {

-            get { return hasHollow; }

-        }

-

-

-        /// <summary>

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

-        /// </summary>

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

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

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

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

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

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

-        {

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

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

-

-            this.sides = sides;

-            this.profileStart = profileStart;

-            this.profileEnd = profileEnd;

-            this.hollow = hollow;

-            this.hollowSides = hollowSides;

-

-            if (sides < 3)

-                this.sides = 3;

-            if (hollowSides < 3)

-                this.hollowSides = 3;

-            if (profileStart < 0.0f)

-                this.profileStart = 0.0f;

-            if (profileEnd > 1.0f)

-                this.profileEnd = 1.0f;

-            if (profileEnd < 0.02f)

-                this.profileEnd = 0.02f;

-            if (profileStart >= profileEnd)

-                this.profileStart = profileEnd - 0.02f;

-            if (hollow > 0.99f)

-                this.hollow = 0.99f;

-            if (hollow < 0.0f)

-                this.hollow = 0.0f;

-

-            //if (sphereMode)

-            //    this.hasProfileCut = this.profileEnd - this.profileStart < 0.4999f;

-            //else

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

-            //    this.hasProfileCut = this.profileEnd - this.profileStart < 0.9999f;

-            //this.hasHollow = (this.hollow > 0.001f);

-        }

-

-        /// <summary>

-        /// Extrudes a profile along a path.

-        /// </summary>

-        public void Extrude(PathType pathType)

-        {

-            bool needEndFaces = false;

-

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

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

-

-            if (this.viewerMode)

-            {

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

-                this.calcVertexNormals = true;

-            }

-

-            if (this.calcVertexNormals)

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

-

-            int steps = 1;

-

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

-            normalsProcessed = false;

-

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

-            {

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

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

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

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

-            }

-

-            if (sphereMode)

-                this.hasProfileCut = this.profileEnd - this.profileStart < 0.4999f;

-            else

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

-                this.hasProfileCut = this.profileEnd - this.profileStart < 0.9999f;

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

-

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

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

-            float twistTotal = twistEnd - twistBegin;

-            float twistTotalAbs = Math.Abs(twistTotal);

-            if (twistTotalAbs > 0.01f)

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

-

-            float hollow = this.hollow;

-

-            // 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;

-

-            //profileOuterFaceNumber = profile.faceNumbers[0];

-            //if (!needEndFaces)

-            //    profileOuterFaceNumber--;

-            //profileOuterFaceNumber = needEndFaces ? 1 : 0;

-

-

-            //if (hasHollow)

-            //{

-            //    if (needEndFaces)

-            //        profileHollowFaceNumber = profile.faceNumbers[profile.numOuterVerts + 1];

-            //    else

-            //        profileHollowFaceNumber = profile.faceNumbers[profile.numOuterVerts] - 1;

-            //}

-

-

-            profileOuterFaceNumber = profile.outerFaceNumber;

-            if (!needEndFaces)

-                profileOuterFaceNumber--;

-

-            if (hasHollow)

-            {

-                profileHollowFaceNumber = profile.hollowFaceNumber;

-                if (!needEndFaces)

-                    profileHollowFaceNumber--;

-            }

-

-            int cut1Vert = -1;

-            int cut2Vert = -1;

-            if (hasProfileCut)

-            {

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

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

-            }

-

-            if (initialProfileRot != 0.0f)

-            {

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

-                if (viewerMode)

-                    profile.MakeFaceUVs();

-            }

-

-            Coord lastCutNormal1 = new Coord();

-            Coord lastCutNormal2 = new Coord();

-            float 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);

-

-

-            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 || this.hasHollow)

-                        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;

-                                    //this.profileOuterFaceNumber = primFaceNum;

-                                }

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

-                                {

-                                    u1 *= 2.0f;

-                                    u2 *= 2.0f;

-                                    //this.profileHollowFaceNumber = primFaceNum;

-                                }

-                            }

-

-                            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 int outerFaceNumber = -1;
+        internal int hollowFaceNumber = -1;
+
+        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)
+            {
+                int lastOuterVertIndex = this.numOuterVerts - 1;
+
+                if (hasHollow)
+                {
+                    this.cut1CoordIndices.Add(0);
+                    this.cut1CoordIndices.Add(this.coords.Count - 1);
+
+                    this.cut2CoordIndices.Add(lastOuterVertIndex + 1);
+                    this.cut2CoordIndices.Add(lastOuterVertIndex);
+
+                    this.cutNormal1.X = this.coords[0].Y - this.coords[this.coords.Count - 1].Y;
+                    this.cutNormal1.Y = -(this.coords[0].X - this.coords[this.coords.Count - 1].X);
+
+                    this.cutNormal2.X = this.coords[lastOuterVertIndex + 1].Y - this.coords[lastOuterVertIndex].Y;
+                    this.cutNormal2.Y = -(this.coords[lastOuterVertIndex + 1].X - this.coords[lastOuterVertIndex].X);
+                }
+
+                else
+                {
+                    this.cut1CoordIndices.Add(0);
+                    this.cut1CoordIndices.Add(1);
+
+                    this.cut2CoordIndices.Add(lastOuterVertIndex);
+                    this.cut2CoordIndices.Add(0);
+
+                    this.cutNormal1.X = this.vertexNormals[1].Y;
+                    this.cutNormal1.Y = -this.vertexNormals[1].X;
+
+                    this.cutNormal2.X = -this.vertexNormals[this.vertexNormals.Count - 2].Y;
+                    this.cutNormal2.Y = this.vertexNormals[this.vertexNormals.Count - 2].X;
+
+                }
+                this.cutNormal1.Normalize();
+                this.cutNormal2.Normalize();
+            }
+
+            this.MakeFaceUVs();
+
+            hollowCoords = null;
+            hollowNormals = null;
+            hollowUs = null;
+
+            if (calcVertexNormals)
+            { // calculate prim face numbers
+
+                // face number order is top, outer, hollow, bottom, start cut, end cut
+                // I know it's ugly but so is the whole concept of prim face numbers
+
+                int faceNum = 1; // start with outer faces
+                this.outerFaceNumber = faceNum;
+
+                int startVert = hasProfileCut && !hasHollow ? 1 : 0;
+                if (startVert > 0)
+                    this.faceNumbers.Add(-1);
+                for (int i = 0; i < this.numOuterVerts - 1; i++)
+                    //this.faceNumbers.Add(sides < 5 ? faceNum++ : faceNum);
+                    this.faceNumbers.Add(sides < 5 && i < sides ? faceNum++ : faceNum);
+
+                //if (!hasHollow && !hasProfileCut)
+                //    this.bottomFaceNumber = faceNum++;
+
+                this.faceNumbers.Add(hasProfileCut ? -1 : faceNum++);
+
+                if (sides > 4 && (hasHollow || hasProfileCut))
+                    faceNum++;
+
+                if (sides < 5 && (hasHollow || hasProfileCut) && this.numOuterVerts < sides)
+                    faceNum++;
+
+                if (hasHollow)
+                {
+                    for (int i = 0; i < this.numHollowVerts; i++)
+                        this.faceNumbers.Add(faceNum);
+
+                    this.hollowFaceNumber = faceNum++;
+                }
+                //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 int profileOuterFaceNumber = -1;
+        private int profileHollowFaceNumber = -1;
+
+        private bool hasProfileCut = false;
+        private bool hasHollow = false;
+        public bool calcVertexNormals = false;
+        private bool normalsProcessed = false;
+        public bool viewerMode = false;
+        public bool sphereMode = false;
+
+        public int numPrimFaces = 0;
+
+        /// <summary>
+        /// Human readable string representation of the parameters used to create a mesh.
+        /// </summary>
+        /// <returns></returns>
+        public string ParamsToDisplayString()
+        {
+            string s = "";
+            s += "sides..................: " + this.sides.ToString();
+            s += "\nhollowSides..........: " + this.hollowSides.ToString();
+            s += "\nprofileStart.........: " + this.profileStart.ToString();
+            s += "\nprofileEnd...........: " + this.profileEnd.ToString();
+            s += "\nhollow...............: " + this.hollow.ToString();
+            s += "\ntwistBegin...........: " + this.twistBegin.ToString();
+            s += "\ntwistEnd.............: " + this.twistEnd.ToString();
+            s += "\ntopShearX............: " + this.topShearX.ToString();
+            s += "\ntopShearY............: " + this.topShearY.ToString();
+            s += "\npathCutBegin.........: " + this.pathCutBegin.ToString();
+            s += "\npathCutEnd...........: " + this.pathCutEnd.ToString();
+            s += "\ndimpleBegin..........: " + this.dimpleBegin.ToString();
+            s += "\ndimpleEnd............: " + this.dimpleEnd.ToString();
+            s += "\nskew.................: " + this.skew.ToString();
+            s += "\nholeSizeX............: " + this.holeSizeX.ToString();
+            s += "\nholeSizeY............: " + this.holeSizeY.ToString();
+            s += "\ntaperX...............: " + this.taperX.ToString();
+            s += "\ntaperY...............: " + this.taperY.ToString();
+            s += "\nradius...............: " + this.radius.ToString();
+            s += "\nrevolutions..........: " + this.revolutions.ToString();
+            s += "\nstepsPerRevolution...: " + this.stepsPerRevolution.ToString();
+            s += "\nsphereMode...........: " + this.sphereMode.ToString();
+            s += "\nhasProfileCut........: " + this.hasProfileCut.ToString();
+            s += "\nhasHollow............: " + this.hasHollow.ToString();
+            s += "\nviewerMode...........: " + this.viewerMode.ToString();
+
+            return s;
+        }
+
+        public int ProfileOuterFaceNumber
+        {
+            get { return profileOuterFaceNumber; }
+        }
+
+        public int ProfileHollowFaceNumber
+        {
+            get { return profileHollowFaceNumber; }
+        }
+
+        public bool HasProfileCut
+        {
+            get { return hasProfileCut; }
+        }
+
+        public bool HasHollow
+        {
+            get { return hasHollow; }
+        }
+
+
+        /// <summary>
+        /// Constructs a PrimMesh object and creates the profile for extrusion.
+        /// </summary>
+        /// <param name="sides"></param>
+        /// <param name="profileStart"></param>
+        /// <param name="profileEnd"></param>
+        /// <param name="hollow"></param>
+        /// <param name="hollowSides"></param>
+        public PrimMesh(int sides, float profileStart, float profileEnd, float hollow, int hollowSides)
+        {
+            this.coords = new List<Coord>();
+            this.faces = new List<Face>();
+
+            this.sides = sides;
+            this.profileStart = profileStart;
+            this.profileEnd = profileEnd;
+            this.hollow = hollow;
+            this.hollowSides = hollowSides;
+
+            if (sides < 3)
+                this.sides = 3;
+            if (hollowSides < 3)
+                this.hollowSides = 3;
+            if (profileStart < 0.0f)
+                this.profileStart = 0.0f;
+            if (profileEnd > 1.0f)
+                this.profileEnd = 1.0f;
+            if (profileEnd < 0.02f)
+                this.profileEnd = 0.02f;
+            if (profileStart >= profileEnd)
+                this.profileStart = profileEnd - 0.02f;
+            if (hollow > 0.99f)
+                this.hollow = 0.99f;
+            if (hollow < 0.0f)
+                this.hollow = 0.0f;
+
+            //if (sphereMode)
+            //    this.hasProfileCut = this.profileEnd - this.profileStart < 0.4999f;
+            //else
+            //    //this.hasProfileCut = (this.profileStart > 0.0f || this.profileEnd < 1.0f);
+            //    this.hasProfileCut = this.profileEnd - this.profileStart < 0.9999f;
+            //this.hasHollow = (this.hollow > 0.001f);
+        }
+
+        /// <summary>
+        /// Extrudes a profile along a path.
+        /// </summary>
+        public void Extrude(PathType pathType)
+        {
+            bool needEndFaces = false;
+
+            this.coords = new List<Coord>();
+            this.faces = new List<Face>();
+
+            if (this.viewerMode)
+            {
+                this.viewerFaces = new List<ViewerFace>();
+                this.calcVertexNormals = true;
+            }
+
+            if (this.calcVertexNormals)
+                this.normals = new List<Coord>();
+
+            int steps = 1;
+
+            float length = this.pathCutEnd - this.pathCutBegin;
+            normalsProcessed = false;
+
+            if (this.viewerMode && this.sides == 3)
+            {
+                // prisms don't taper well so add some vertical resolution
+                // other prims may benefit from this but just do prisms for now
+                if (Math.Abs(this.taperX) > 0.01 || Math.Abs(this.taperY) > 0.01)
+                    steps = (int)(steps * 4.5 * length);
+            }
+
+            if (sphereMode)
+                this.hasProfileCut = this.profileEnd - this.profileStart < 0.4999f;
+            else
+                //this.hasProfileCut = (this.profileStart > 0.0f || this.profileEnd < 1.0f);
+                this.hasProfileCut = this.profileEnd - this.profileStart < 0.9999f;
+            this.hasHollow = (this.hollow > 0.001f);
+
+            float twistBegin = this.twistBegin / 360.0f * twoPi;
+            float twistEnd = this.twistEnd / 360.0f * twoPi;
+            float twistTotal = twistEnd - twistBegin;
+            float twistTotalAbs = Math.Abs(twistTotal);
+            if (twistTotalAbs > 0.01f)
+                steps += (int)(twistTotalAbs * 3.66); //  dahlia's magic number
+
+            float hollow = this.hollow;
+
+            // 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;
+
+            //profileOuterFaceNumber = profile.faceNumbers[0];
+            //if (!needEndFaces)
+            //    profileOuterFaceNumber--;
+            //profileOuterFaceNumber = needEndFaces ? 1 : 0;
+
+
+            //if (hasHollow)
+            //{
+            //    if (needEndFaces)
+            //        profileHollowFaceNumber = profile.faceNumbers[profile.numOuterVerts + 1];
+            //    else
+            //        profileHollowFaceNumber = profile.faceNumbers[profile.numOuterVerts] - 1;
+            //}
+
+
+            profileOuterFaceNumber = profile.outerFaceNumber;
+            if (!needEndFaces)
+                profileOuterFaceNumber--;
+
+            if (hasHollow)
+            {
+                profileHollowFaceNumber = profile.hollowFaceNumber;
+                if (!needEndFaces)
+                    profileHollowFaceNumber--;
+            }
+
+            int cut1Vert = -1;
+            int cut2Vert = -1;
+            if (hasProfileCut)
+            {
+                cut1Vert = hasHollow ? profile.coords.Count - 1 : 0;
+                cut2Vert = hasHollow ? profile.numOuterVerts - 1 : profile.numOuterVerts;
+            }
+
+            if (initialProfileRot != 0.0f)
+            {
+                profile.AddRot(new Quat(new Coord(0.0f, 0.0f, 1.0f), initialProfileRot));
+                if (viewerMode)
+                    profile.MakeFaceUVs();
+            }
+
+            Coord lastCutNormal1 = new Coord();
+            Coord lastCutNormal2 = new Coord();
+            float 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);
+
+
+            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 || this.hasHollow)
+                        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;
+                                    //this.profileOuterFaceNumber = primFaceNum;
+                                }
+                                else if (whichVert > profile.coords.Count - profile.numHollowVerts - 1)
+                                {
+                                    u1 *= 2.0f;
+                                    u2 *= 2.0f;
+                                    //this.profileHollowFaceNumber = primFaceNum;
+                                }
+                            }
+
+                            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/SculptMap.cs b/OpenSim/Region/Physics/Meshing/SculptMap.cs
index 4906cf6..d2d71de 100644
--- a/OpenSim/Region/Physics/Meshing/SculptMap.cs
+++ b/OpenSim/Region/Physics/Meshing/SculptMap.cs
@@ -1,176 +1,176 @@
-/*

- * 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;

-

-#if SYSTEM_DRAWING

-using System.Drawing;

-using System.Drawing.Imaging;

-

-namespace PrimMesher

-{

-    public class SculptMap

-    {

-        public int width;

-        public int height;

-        public byte[] redBytes;

-        public byte[] greenBytes;

-        public byte[] blueBytes;

-

-        public SculptMap()

-        {

-        }

-

-        public SculptMap(Bitmap bm, int lod)

-        {

-            int bmW = bm.Width;

-            int bmH = bm.Height;

-

-            if (bmW == 0 || bmH == 0)

-                throw new Exception("SculptMap: bitmap has no data");

-

-            int numLodPixels = lod * 2 * lod * 2;  // (32 * 2)^2  = 64^2 pixels for default sculpt map image

-

-            bool needsScaling = false;

-

-            width = bmW;

-            height = bmH;

-            while (width * height > numLodPixels)

-            {

-                width >>= 1;

-                height >>= 1;

-                needsScaling = true;

-            }

-

-

-

-            try

-            {

-                if (needsScaling)

-                    bm = ScaleImage(bm, width, height,

-                        System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor);

-            }

-

-            catch (Exception e)

-            {

-                throw new Exception("Exception in ScaleImage(): e: " + e.ToString());

-            }

-

-            if (width * height > lod * lod)

-            {

-                width >>= 1;

-                height >>= 1;

-            }

-

-            int numBytes = (width + 1) * (height + 1);

-            redBytes = new byte[numBytes];

-            greenBytes = new byte[numBytes];

-            blueBytes = new byte[numBytes];

-

-            int byteNdx = 0;

-

-            try

-            {

-                for (int y = 0; y <= height; y++)

-                {

-                    for (int x = 0; x <= width; x++)

-                    {

-                        int bmY = y < height ? y * 2 : y * 2 - 1;

-                        int bmX = x < width ? x * 2 : x * 2 - 1;

-                        Color c = bm.GetPixel(bmX, bmY);

-

-                        redBytes[byteNdx] = c.R;

-                        greenBytes[byteNdx] = c.G;

-                        blueBytes[byteNdx] = c.B;

-

-                        ++byteNdx;

-                    }

-                }

-            }

-            catch (Exception e)

-            {

-                throw new Exception("Caught exception processing byte arrays in SculptMap(): e: " + e.ToString());

-            }

-

-            width++;

-            height++;

-        }

-

-        public List<List<Coord>> ToRows(bool mirror)

-        {

-            int numRows = height;

-            int numCols = width;

-

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

-

-            float pixScale = 1.0f / 255;

-

-            int rowNdx, colNdx;

-            int smNdx = 0;

-

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

-            {

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

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

-                {

-                    if (mirror)

-                        row.Add(new Coord(-(redBytes[smNdx] * pixScale - 0.5f), (greenBytes[smNdx] * pixScale - 0.5f), blueBytes[smNdx] * pixScale - 0.5f));

-                    else

-                        row.Add(new Coord(redBytes[smNdx] * pixScale - 0.5f, greenBytes[smNdx] * pixScale - 0.5f, blueBytes[smNdx] * pixScale - 0.5f));

-

-                    ++smNdx;

-                }

-                rows.Add(row);

-            }

-            return rows;

-        }

-

-        private Bitmap ScaleImage(Bitmap srcImage, int destWidth, int destHeight,

-                System.Drawing.Drawing2D.InterpolationMode interpMode)

-        {

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

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

-

-            Graphics grPhoto = Graphics.FromImage(scaledImage);

-            grPhoto.InterpolationMode = interpMode;

-

-            grPhoto.DrawImage(srcImage,

-                new Rectangle(0, 0, destWidth, destHeight),

-                new Rectangle(0, 0, srcImage.Width, srcImage.Height),

-                GraphicsUnit.Pixel);

-

-            grPhoto.Dispose();

-            return scaledImage;

-        }

-    }

-}

-#endif

+/*
+ * 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;
+
+#if SYSTEM_DRAWING
+using System.Drawing;
+using System.Drawing.Imaging;
+
+namespace PrimMesher
+{
+    public class SculptMap
+    {
+        public int width;
+        public int height;
+        public byte[] redBytes;
+        public byte[] greenBytes;
+        public byte[] blueBytes;
+
+        public SculptMap()
+        {
+        }
+
+        public SculptMap(Bitmap bm, int lod)
+        {
+            int bmW = bm.Width;
+            int bmH = bm.Height;
+
+            if (bmW == 0 || bmH == 0)
+                throw new Exception("SculptMap: bitmap has no data");
+
+            int numLodPixels = lod * 2 * lod * 2;  // (32 * 2)^2  = 64^2 pixels for default sculpt map image
+
+            bool needsScaling = false;
+
+            width = bmW;
+            height = bmH;
+            while (width * height > numLodPixels)
+            {
+                width >>= 1;
+                height >>= 1;
+                needsScaling = true;
+            }
+
+
+
+            try
+            {
+                if (needsScaling)
+                    bm = ScaleImage(bm, width, height,
+                        System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor);
+            }
+
+            catch (Exception e)
+            {
+                throw new Exception("Exception in ScaleImage(): e: " + e.ToString());
+            }
+
+            if (width * height > lod * lod)
+            {
+                width >>= 1;
+                height >>= 1;
+            }
+
+            int numBytes = (width + 1) * (height + 1);
+            redBytes = new byte[numBytes];
+            greenBytes = new byte[numBytes];
+            blueBytes = new byte[numBytes];
+
+            int byteNdx = 0;
+
+            try
+            {
+                for (int y = 0; y <= height; y++)
+                {
+                    for (int x = 0; x <= width; x++)
+                    {
+                        int bmY = y < height ? y * 2 : y * 2 - 1;
+                        int bmX = x < width ? x * 2 : x * 2 - 1;
+                        Color c = bm.GetPixel(bmX, bmY);
+
+                        redBytes[byteNdx] = c.R;
+                        greenBytes[byteNdx] = c.G;
+                        blueBytes[byteNdx] = c.B;
+
+                        ++byteNdx;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                throw new Exception("Caught exception processing byte arrays in SculptMap(): e: " + e.ToString());
+            }
+
+            width++;
+            height++;
+        }
+
+        public List<List<Coord>> ToRows(bool mirror)
+        {
+            int numRows = height;
+            int numCols = width;
+
+            List<List<Coord>> rows = new List<List<Coord>>(numRows);
+
+            float pixScale = 1.0f / 255;
+
+            int rowNdx, colNdx;
+            int smNdx = 0;
+
+            for (rowNdx = 0; rowNdx < numRows; rowNdx++)
+            {
+                List<Coord> row = new List<Coord>(numCols);
+                for (colNdx = 0; colNdx < numCols; colNdx++)
+                {
+                    if (mirror)
+                        row.Add(new Coord(-(redBytes[smNdx] * pixScale - 0.5f), (greenBytes[smNdx] * pixScale - 0.5f), blueBytes[smNdx] * pixScale - 0.5f));
+                    else
+                        row.Add(new Coord(redBytes[smNdx] * pixScale - 0.5f, greenBytes[smNdx] * pixScale - 0.5f, blueBytes[smNdx] * pixScale - 0.5f));
+
+                    ++smNdx;
+                }
+                rows.Add(row);
+            }
+            return rows;
+        }
+
+        private Bitmap ScaleImage(Bitmap srcImage, int destWidth, int destHeight,
+                System.Drawing.Drawing2D.InterpolationMode interpMode)
+        {
+            Bitmap scaledImage = new Bitmap(srcImage, destWidth, destHeight);
+            scaledImage.SetResolution(96.0f, 96.0f);
+
+            Graphics grPhoto = Graphics.FromImage(scaledImage);
+            grPhoto.InterpolationMode = interpMode;
+
+            grPhoto.DrawImage(srcImage,
+                new Rectangle(0, 0, destWidth, destHeight),
+                new Rectangle(0, 0, srcImage.Width, srcImage.Height),
+                GraphicsUnit.Pixel);
+
+            grPhoto.Dispose();
+            return scaledImage;
+        }
+    }
+}
+#endif
diff --git a/OpenSim/Region/Physics/Meshing/SculptMesh.cs b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
index 06606c3..6aa8fe4 100644
--- a/OpenSim/Region/Physics/Meshing/SculptMesh.cs
+++ b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
@@ -1,647 +1,647 @@
-/*

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

-

-        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;

-        }

-

-        private List<List<Coord>> bitmap2CoordsSampled(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 / 256.0f;

-

-            int imageX, imageY = 0;

-

-            int rowNdx, colNdx;

-

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

-            {

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

-                imageY = rowNdx * scale;

-                if (rowNdx == numRows) imageY--;

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

-                {

-                    imageX = colNdx * scale;

-                    if (colNdx == numCols) imageX--;

-

-                    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);

-                    }

-

-                    if (mirror)

-                        row.Add(new Coord(-(c.R * pixScale - 0.5f), c.G * pixScale - 0.5f, c.B * pixScale - 0.5f));

-                    else

-                        row.Add(new Coord(c.R * pixScale - 0.5f, c.G * pixScale - 0.5f, c.B * pixScale - 0.5f));

-

-                }

-                rows.Add(row);

-            }

-            return rows;

-        }

-

-

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

-        {

-            _SculptMesh(new SculptMap(sculptBitmap, lod).ToRows(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)

-            {

-                if (rows.Count % 2 == 0)

-                {

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

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

-                }

-                else

-                {

-                    int lastIndex = rows[0].Count - 1;

-

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

-                        rows[i][0] = rows[i][lastIndex];

-                }

-            }

-

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

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

-

-            if (sculptType == SculptType.sphere)

-            {

-                if (rows.Count % 2 == 0)

-                {

-                    int count = rows[0].Count;

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

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

-

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

-                    {

-                        topPoleRow.Add(topPole);

-                        bottomPoleRow.Add(bottomPole);

-                    }

-                    rows.Insert(0, topPoleRow);

-                    rows.Add(bottomPoleRow);

-                }

-                else

-                {

-                    int count = rows[0].Count;

-

-                    List<Coord> topPoleRow = rows[0];

-                    List<Coord> bottomPoleRow = rows[rows.Count - 1];

-

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

-                    {

-                        topPoleRow[i] = topPole;

-                        bottomPoleRow[i] = bottomPole;

-                    }

-                }

-            }

-

-            if (sculptType == SculptType.torus)

-                rows.Add(rows[0]);

-

-            int coordsDown = rows.Count;

-            int coordsAcross = rows[0].Count;

-            int lastColumn = coordsAcross - 1;

-

-            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++)

-                {

+/*
+ * 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
+
+        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 + 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();

-        }

-    }

-}

+                    */
+
+                    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;
+        }
+
+        private List<List<Coord>> bitmap2CoordsSampled(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 / 256.0f;
+
+            int imageX, imageY = 0;
+
+            int rowNdx, colNdx;
+
+            for (rowNdx = 0; rowNdx <= numRows; rowNdx++)
+            {
+                List<Coord> row = new List<Coord>(numCols);
+                imageY = rowNdx * scale;
+                if (rowNdx == numRows) imageY--;
+                for (colNdx = 0; colNdx <= numCols; colNdx++)
+                {
+                    imageX = colNdx * scale;
+                    if (colNdx == numCols) imageX--;
+
+                    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);
+                    }
+
+                    if (mirror)
+                        row.Add(new Coord(-(c.R * pixScale - 0.5f), c.G * pixScale - 0.5f, c.B * pixScale - 0.5f));
+                    else
+                        row.Add(new Coord(c.R * pixScale - 0.5f, c.G * pixScale - 0.5f, c.B * pixScale - 0.5f));
+
+                }
+                rows.Add(row);
+            }
+            return rows;
+        }
+
+
+        void _SculptMesh(Bitmap sculptBitmap, SculptType sculptType, int lod, bool viewerMode, bool mirror, bool invert)
+        {
+            _SculptMesh(new SculptMap(sculptBitmap, lod).ToRows(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)
+            {
+                if (rows.Count % 2 == 0)
+                {
+                    for (int rowNdx = 0; rowNdx < rows.Count; rowNdx++)
+                        rows[rowNdx].Add(rows[rowNdx][0]);
+                }
+                else
+                {
+                    int lastIndex = rows[0].Count - 1;
+
+                    for (int i = 0; i < rows.Count; i++)
+                        rows[i][0] = rows[i][lastIndex];
+                }
+            }
+
+            Coord topPole = rows[0][width / 2];
+            Coord bottomPole = rows[rows.Count - 1][width / 2];
+
+            if (sculptType == SculptType.sphere)
+            {
+                if (rows.Count % 2 == 0)
+                {
+                    int count = rows[0].Count;
+                    List<Coord> topPoleRow = new List<Coord>(count);
+                    List<Coord> bottomPoleRow = new List<Coord>(count);
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        topPoleRow.Add(topPole);
+                        bottomPoleRow.Add(bottomPole);
+                    }
+                    rows.Insert(0, topPoleRow);
+                    rows.Add(bottomPoleRow);
+                }
+                else
+                {
+                    int count = rows[0].Count;
+
+                    List<Coord> topPoleRow = rows[0];
+                    List<Coord> bottomPoleRow = rows[rows.Count - 1];
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        topPoleRow[i] = topPole;
+                        bottomPoleRow[i] = bottomPole;
+                    }
+                }
+            }
+
+            if (sculptType == SculptType.torus)
+                rows.Add(rows[0]);
+
+            int coordsDown = rows.Count;
+            int coordsAcross = rows[0].Count;
+            int lastColumn = coordsAcross - 1;
+
+            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/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
index 4ebf933..3104917 100644
--- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
@@ -90,8 +90,6 @@ namespace OpenSim.Server.Handlers.Presence
                         return GetAgent(request);
                     case "getagents":
                         return GetAgents(request);
-                    case "sethome":
-                        return SetHome(request);
                 }
                 m_log.DebugFormat("[PRESENCE HANDLER]: unknown method request: {0}", method);
             }
@@ -140,12 +138,7 @@ namespace OpenSim.Server.Handlers.Presence
             if (!UUID.TryParse(request["SessionID"].ToString(), out session))
                 return FailureResult();
 
-            if (request.ContainsKey("Position") && request["Position"] != null)
-                Vector3.TryParse(request["Position"].ToString(), out position);
-            if (request.ContainsKey("LookAt") && request["Position"] != null)
-                Vector3.TryParse(request["LookAt"].ToString(), out lookat);
-
-            if (m_PresenceService.LogoutAgent(session, position, lookat))
+            if (m_PresenceService.LogoutAgent(session))
                 return SuccessResult();
 
             return FailureResult();
@@ -171,8 +164,6 @@ namespace OpenSim.Server.Handlers.Presence
         {
             UUID session = UUID.Zero;
             UUID region = UUID.Zero;
-            Vector3 position = new Vector3(128, 128, 70);
-            Vector3 look = Vector3.Zero;
 
             if (!request.ContainsKey("SessionID") || !request.ContainsKey("RegionID"))
                 return FailureResult();
@@ -183,13 +174,7 @@ namespace OpenSim.Server.Handlers.Presence
             if (!UUID.TryParse(request["RegionID"].ToString(), out region))
                 return FailureResult();
 
-            if (request.ContainsKey("position"))
-                Vector3.TryParse(request["position"].ToString(), out position);
-
-            if (request.ContainsKey("lookAt"))
-                Vector3.TryParse(request["lookAt"].ToString(), out look);
-
-            if (m_PresenceService.ReportAgent(session, region, position, look))
+            if (m_PresenceService.ReportAgent(session, region))
             {
                 return SuccessResult();
             }
@@ -318,31 +303,5 @@ namespace OpenSim.Server.Handlers.Presence
             return ms.ToArray();
         }
 
-        byte[] SetHome(Dictionary<string, object> request)
-        {
-            UUID region = UUID.Zero;
-            Vector3 position = new Vector3(128, 128, 70);
-            Vector3 look = Vector3.Zero;
-
-            if (!request.ContainsKey("UserID") || !request.ContainsKey("RegionID"))
-                return FailureResult();
-
-            string user = request["UserID"].ToString();
-
-            if (!UUID.TryParse(request["RegionID"].ToString(), out region))
-                return FailureResult();
-
-            if (request.ContainsKey("position"))
-                Vector3.TryParse(request["position"].ToString(), out position);
-
-            if (request.ContainsKey("lookAt"))
-                Vector3.TryParse(request["lookAt"].ToString(), out look);
-            
-            if (m_PresenceService.SetHomeLocation(user, region, position, look))
-                return SuccessResult();
-
-            return FailureResult();
-        }
-
     }
 }
diff --git a/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
index 0e85067..b4500a5 100644
--- a/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
+++ b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
@@ -25,14 +25,206 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using log4net;
 using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Server.Base;
+using OpenMetaverse;
 
 namespace OpenSim.Services.Connectors
 {
-    public class GridUserServiceConnector
+    public class GridUserServicesConnector : IGridUserService
     {
-        public GridUserServiceConnector()
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_ServerURI = String.Empty;
+
+        public GridUserServicesConnector()
+        {
+        }
+
+        public GridUserServicesConnector(string serverURI)
+        {
+            m_ServerURI = serverURI.TrimEnd('/');
+        }
+
+        public GridUserServicesConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public virtual void Initialise(IConfigSource source)
+        {
+            IConfig gridConfig = source.Configs["GridUserService"];
+            if (gridConfig == null)
+            {
+                m_log.Error("[GRID USER CONNECTOR]: GridUserService missing from OpenSim.ini");
+                throw new Exception("GridUser connector init error");
+            }
+
+            string serviceURI = gridConfig.GetString("GridUserServerURI",
+                    String.Empty);
+
+            if (serviceURI == String.Empty)
+            {
+                m_log.Error("[GRID USER CONNECTOR]: No Server URI named in section GridUserService");
+                throw new Exception("GridUser connector init error");
+            }
+            m_ServerURI = serviceURI;
+        }
+
+
+        #region IPresenceService
+
+
+        public GridUserInfo LoggedIn(string userID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "loggedin";
+
+            sendData["UserID"] = userID;
+
+            return Get(sendData);
+
+        }
+
+        public bool LoggedOut(string userID, UUID region, Vector3 position, Vector3 lookat)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "loggedout";
+
+            return Set(sendData, userID, region, position, lookat);
+        }
+
+        public bool SetHome(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "sethome";
+
+            return Set(sendData, userID, regionID, position, lookAt);
+        }
+
+        public bool SetLastPosition(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "setposition";
+
+            return Set(sendData, userID, regionID, position, lookAt);
+        }
+
+        public GridUserInfo GetGridUserInfo(string userID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            //sendData["SCOPEID"] = scopeID.ToString();
+            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+            sendData["METHOD"] = "getgriduserinfo";
+
+            sendData["UserID"] = userID;
+
+            return Get(sendData);
+        }
+
+        #endregion
+
+        protected bool Set(Dictionary<string, object> sendData, string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            sendData["UserID"] = userID;
+            sendData["RegionID"] = regionID.ToString();
+            sendData["Position"] = position.ToString();
+            sendData["LookAt"] = lookAt.ToString();
+
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[GRID USER CONNECTOR]: queryString = {0}", reqString);
+            try
+            {
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/griduser",
+                        reqString);
+                if (reply != string.Empty)
+                {
+                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                    if (replyData.ContainsKey("result"))
+                    {
+                        if (replyData["result"].ToString().ToLower() == "success")
+                            return true;
+                        else
+                            return false;
+                    }
+                    else
+                        m_log.DebugFormat("[GRID USER CONNECTOR]: SetPosition reply data does not contain result field");
+
+                }
+                else
+                    m_log.DebugFormat("[GRID USER CONNECTOR]: SetPosition received empty reply");
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[GRID USER CONNECTOR]: Exception when contacting grid user server: {0}", e.Message);
+            }
+
+            return false;
+        }
+
+        protected GridUserInfo Get(Dictionary<string, object> sendData)
         {
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[GRID USER CONNECTOR]: queryString = {0}", reqString);
+            try
+            {
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/griduser",
+                        reqString);
+                if (reply != string.Empty)
+                {
+                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+                    GridUserInfo guinfo = null;
+
+                    if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null))
+                    {
+                        if (replyData["result"] is Dictionary<string, object>)
+                        {
+                            guinfo = new GridUserInfo((Dictionary<string, object>)replyData["result"]);
+                        }
+                    }
+
+                    return guinfo;
+
+                }
+                else
+                    m_log.DebugFormat("[GRID USER CONNECTOR]: Loggedin received empty reply");
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[GRID USER CONNECTOR]: Exception when contacting grid user server: {0}", e.Message);
+            }
+
+            return null;
+
         }
+
     }
 }
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
index 23621b7..41ebeaf 100644
--- a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Services.Connectors
 
         }
 
-        public bool LogoutAgent(UUID sessionID, Vector3 position, Vector3 lookat)
+        public bool LogoutAgent(UUID sessionID)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             //sendData["SCOPEID"] = scopeID.ToString();
@@ -141,8 +141,6 @@ namespace OpenSim.Services.Connectors
             sendData["METHOD"] = "logout";
 
             sendData["SessionID"] = sessionID.ToString();
-            sendData["Position"] = position.ToString();
-            sendData["LookAt"] = lookat.ToString();
 
             string reqString = ServerUtils.BuildQueryString(sendData);
             // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
@@ -220,7 +218,7 @@ namespace OpenSim.Services.Connectors
             return false;
         }
 
-        public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
+        public bool ReportAgent(UUID sessionID, UUID regionID)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             //sendData["SCOPEID"] = scopeID.ToString();
@@ -230,8 +228,6 @@ namespace OpenSim.Services.Connectors
 
             sendData["SessionID"] = sessionID.ToString();
             sendData["RegionID"] = regionID.ToString();
-            sendData["position"] = position.ToString();
-            sendData["lookAt"] = lookAt.ToString();
 
             string reqString = ServerUtils.BuildQueryString(sendData);
             // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
@@ -371,52 +367,6 @@ namespace OpenSim.Services.Connectors
         }
 
 
-        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
-        {
-            Dictionary<string, object> sendData = new Dictionary<string, object>();
-            //sendData["SCOPEID"] = scopeID.ToString();
-            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
-            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
-            sendData["METHOD"] = "sethome";
-
-            sendData["UserID"] = userID;
-            sendData["RegionID"] = regionID.ToString();
-            sendData["position"] = position.ToString();
-            sendData["lookAt"] = lookAt.ToString();
-
-            string reqString = ServerUtils.BuildQueryString(sendData);
-            // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
-            try
-            {
-                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
-                        m_ServerURI + "/presence",
-                        reqString);
-                if (reply != string.Empty)
-                {
-                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
-
-                    if (replyData.ContainsKey("result"))
-                    {
-                        if (replyData["result"].ToString().ToLower() == "success")
-                            return true;
-                        else
-                            return false;
-                    }
-                    else
-                        m_log.DebugFormat("[PRESENCE CONNECTOR]: SetHomeLocation reply data does not contain result field");
-
-                }
-                else
-                    m_log.DebugFormat("[PRESENCE CONNECTOR]: SetHomeLocation received empty reply");
-            }
-            catch (Exception e)
-            {
-                m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message);
-            }
-
-            return false;
-        }
-
         #endregion
 
     }
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index c324272..e48b7de 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
     /// message routing) to the SimianGrid backend
     /// </summary>
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class SimianPresenceServiceConnector : IPresenceService, ISharedRegionModule
+    public class SimianPresenceServiceConnector : IPresenceService, IGridUserService, ISharedRegionModule
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -73,6 +73,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             if (!String.IsNullOrEmpty(m_serverUrl))
             {
                 scene.RegisterModuleInterface<IPresenceService>(this);
+                scene.RegisterModuleInterface<IGridUserService>(this);
 
                 scene.EventManager.OnMakeRootAgent += MakeRootAgentHandler;
                 scene.EventManager.OnNewClient += NewClientHandler;
@@ -86,6 +87,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             if (!String.IsNullOrEmpty(m_serverUrl))
             {
                 scene.UnregisterModuleInterface<IPresenceService>(this);
+                scene.UnregisterModuleInterface<IGridUserService>(this);
 
                 scene.EventManager.OnMakeRootAgent -= MakeRootAgentHandler;
                 scene.EventManager.OnNewClient -= NewClientHandler;
@@ -151,7 +153,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return success;
         }
 
-        public bool LogoutAgent(UUID sessionID, Vector3 position, Vector3 lookAt)
+        public bool LogoutAgent(UUID sessionID)
         {
             m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for agent with sessionID " + sessionID);
 
@@ -189,7 +191,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return success;
         }
 
-        public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
+        public bool ReportAgent(UUID sessionID, UUID regionID)
+        {
+            return ReportAgent(sessionID, regionID, Vector3.Zero, Vector3.Zero);
+        }
+
+        protected bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
         {
             //m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Updating session data for agent with sessionID " + sessionID);
 
@@ -261,7 +268,23 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return presences.ToArray();
         }
 
-        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        #endregion IPresenceService
+
+        #region IGridUserService
+
+        public GridUserInfo LoggedIn(string userID)
+        {
+            // never implemented at the sim
+            return null;
+        }
+
+        public bool LoggedOut(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
+        {
+            // Not needed for simian grid, event handler is doing it
+            return true;
+        }
+
+        public bool SetHome(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
         {
             m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Setting home location for user  " + userID);
 
@@ -281,7 +304,35 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return success;
         }
 
-        #endregion IPresenceService
+        public bool SetLastPosition(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
+        {
+            // Not needed for simian grid, presence detection is doing it
+            return true;
+        }
+
+        public GridUserInfo GetGridUserInfo(string user)
+        {
+            m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user);
+
+            UUID userID = new UUID(user);
+            m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID);
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetUser" },
+                { "UserID", userID.ToString() }
+            };
+
+            OSDMap userResponse = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (userResponse["Success"].AsBoolean())
+                return ResponseToGridUserInfo(userResponse);
+            else
+                m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + userResponse["Message"].AsString());
+
+            return null;
+        }
+
+        #endregion
 
         #region Presence Detection
 
@@ -325,7 +376,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     SetLastLocation(client.SessionId);
                 }
 
-                LogoutAgent(client.SessionId, Vector3.Zero, Vector3.UnitX);
+                LogoutAgent(client.SessionId);
             }
         }
 
@@ -478,6 +529,31 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return info;
         }
 
+        private GridUserInfo ResponseToGridUserInfo(OSDMap userResponse)
+        {
+            if (userResponse != null && userResponse["User"] is OSDMap)
+            {
+
+                GridUserInfo info = new GridUserInfo();
+
+                info.Online = true;
+                info.UserID = userResponse["UserID"].AsUUID().ToString();
+                info.LastRegionID = userResponse["SceneID"].AsUUID();
+                info.LastPosition = userResponse["ScenePosition"].AsVector3();
+                info.LastLookAt = userResponse["SceneLookAt"].AsVector3();
+
+                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;
+            }
+
+            return null;
+        }
+        
         private string SerializeLocation(UUID regionID, Vector3 position, Vector3 lookAt)
         {
             return "{" + String.Format("\"SceneID\":\"{0}\",\"Position\":\"{1}\",\"LookAt\":\"{2}\"", regionID, position, lookAt) + "}";
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 26f211b..3af7ef9 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Services.HypergridService
 
         static bool m_Initialized = false;
 
-        protected static IPresenceService m_PresenceService;
+        protected static IGridUserService m_GridUserService;
         protected static IGridService m_GridService;
         protected static GatekeeperServiceConnector m_GatekeeperConnector;
 
@@ -74,14 +74,14 @@ namespace OpenSim.Services.HypergridService
                     throw new Exception(String.Format("No section UserAgentService in config file"));
 
                 string gridService = serverConfig.GetString("GridService", String.Empty);
-                string presenceService = serverConfig.GetString("PresenceService", String.Empty);
+                string gridUserService = serverConfig.GetString("GridUserService", String.Empty);
 
-                if (gridService == string.Empty || presenceService == string.Empty)
+                if (gridService == string.Empty || gridUserService == string.Empty)
                     throw new Exception(String.Format("Incomplete specifications, UserAgent Service cannot function."));
 
                 Object[] args = new Object[] { config };
                 m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
-                m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);
+                m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(gridUserService, args);
                 m_GatekeeperConnector = new GatekeeperServiceConnector();
 
                 m_Initialized = true;
@@ -95,15 +95,14 @@ namespace OpenSim.Services.HypergridService
             m_log.DebugFormat("[USER AGENT SERVICE]: Request to get home region of user {0}", userID);
 
             GridRegion home = null;
-            PresenceInfo[] presences = m_PresenceService.GetAgents(new string[] { userID.ToString() });
-            if (presences != null && presences.Length > 0)
+            GridUserInfo uinfo = m_GridUserService.GetGridUserInfo(userID.ToString());
+            if (uinfo != null)
             {
-                UUID homeID = presences[0].HomeRegionID;
-                if (homeID != UUID.Zero)
+                if (uinfo.HomeRegionID != UUID.Zero)
                 {
-                    home = m_GridService.GetRegionByUUID(UUID.Zero, homeID);
-                    position = presences[0].HomePosition;
-                    lookAt = presences[0].HomeLookAt;
+                    home = m_GridService.GetRegionByUUID(UUID.Zero, uinfo.HomeRegionID);
+                    position = uinfo.HomePosition;
+                    lookAt = uinfo.HomeLookAt;
                 }
                 if (home == null)
                 {
diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs
index a7c2c6f..e629dff 100644
--- a/OpenSim/Services/Interfaces/IGridUserService.cs
+++ b/OpenSim/Services/Interfaces/IGridUserService.cs
@@ -37,39 +37,79 @@ namespace OpenSim.Services.Interfaces
     public class GridUserInfo
     {
         public string UserID;
+        
         public UUID HomeRegionID;
         public Vector3 HomePosition;
         public Vector3 HomeLookAt;
 
+        public UUID LastRegionID;
+        public Vector3 LastPosition;
+        public Vector3 LastLookAt;
+        
+        public bool Online;
+        public DateTime Login;
+        public DateTime Logout;
+
         public GridUserInfo() {}
         
         public GridUserInfo(Dictionary<string, object> kvp)
         {
             if (kvp.ContainsKey("UserID"))
                 UserID = kvp["UserID"].ToString();
+
             if (kvp.ContainsKey("HomeRegionID"))
                 UUID.TryParse(kvp["HomeRegionID"].ToString(), out HomeRegionID);
             if (kvp.ContainsKey("HomePosition"))
                 Vector3.TryParse(kvp["HomePosition"].ToString(), out HomePosition);
             if (kvp.ContainsKey("HomeLookAt"))
                 Vector3.TryParse(kvp["HomeLookAt"].ToString(), out HomeLookAt);
+
+            if (kvp.ContainsKey("LastRegionID"))
+                UUID.TryParse(kvp["LastRegionID"].ToString(), out HomeRegionID);
+            if (kvp.ContainsKey("LastPosition"))
+                Vector3.TryParse(kvp["LastPosition"].ToString(), out LastPosition);
+            if (kvp.ContainsKey("LastLookAt"))
+                Vector3.TryParse(kvp["LastLookAt"].ToString(), out LastLookAt);
+
+            if (kvp.ContainsKey("Login"))
+                DateTime.TryParse(kvp["Login"].ToString(), out Login);
+            if (kvp.ContainsKey("Logout"))
+                DateTime.TryParse(kvp["Logout"].ToString(), out Logout);
+            if (kvp.ContainsKey("Online"))
+                Boolean.TryParse(kvp["Online"].ToString(), out Online);
+
         }
 
         public Dictionary<string, object> ToKeyValuePairs()
         {
             Dictionary<string, object> result = new Dictionary<string, object>();
             result["UserID"] = UserID;
+
             result["HomeRegionID"] = HomeRegionID.ToString();
             result["HomePosition"] = HomePosition.ToString();
             result["HomeLookAt"] = HomeLookAt.ToString();
 
+            result["LastRegionID"] = LastRegionID.ToString();
+            result["LastPosition"] = LastPosition.ToString();
+            result["LastLookAt"] = LastLookAt.ToString();
+
+            result["Online"] = Online.ToString();
+            result["Login"] = Login.ToString();
+            result["Logout"] = Logout.ToString();
+
+            
             return result;
         }
     }
     
     public interface IGridUserService
     {
+        GridUserInfo LoggedIn(string userID);
+        bool LoggedOut(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt);
+        
+        bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt);
+        bool SetLastPosition(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt);
+    
         GridUserInfo GetGridUserInfo(string userID);
-        bool StoreGridUserInfo(GridUserInfo info);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs
index b4c1859..9687d22 100644
--- a/OpenSim/Services/Interfaces/IPresenceService.cs
+++ b/OpenSim/Services/Interfaces/IPresenceService.cs
@@ -55,23 +55,10 @@ namespace OpenSim.Services.Interfaces
                 UserID = kvp["UserID"].ToString();
             if (kvp.ContainsKey("RegionID"))
                 UUID.TryParse(kvp["RegionID"].ToString(), out RegionID);
-            if (kvp.ContainsKey("login"))
-                DateTime.TryParse(kvp["login"].ToString(), out Login);
-            if (kvp.ContainsKey("logout"))
-                DateTime.TryParse(kvp["logout"].ToString(), out Logout);
             if (kvp.ContainsKey("lookAt"))
                 Vector3.TryParse(kvp["lookAt"].ToString(), out LookAt);
-            if (kvp.ContainsKey("online"))
-                Boolean.TryParse(kvp["online"].ToString(), out Online);
             if (kvp.ContainsKey("position"))
                 Vector3.TryParse(kvp["position"].ToString(), out Position);
-            if (kvp.ContainsKey("HomeRegionID"))
-                UUID.TryParse(kvp["HomeRegionID"].ToString(), out HomeRegionID);
-            if (kvp.ContainsKey("HomePosition"))
-                Vector3.TryParse(kvp["HomePosition"].ToString(), out HomePosition);
-            if (kvp.ContainsKey("HomeLookAt"))
-                Vector3.TryParse(kvp["HomeLookAt"].ToString(), out HomeLookAt);
-
         }
 
         public Dictionary<string, object> ToKeyValuePairs()
@@ -79,14 +66,8 @@ namespace OpenSim.Services.Interfaces
             Dictionary<string, object> result = new Dictionary<string, object>();
             result["UserID"] = UserID;
             result["RegionID"] = RegionID.ToString();
-            result["online"] = Online.ToString();
-            result["login"] = Login.ToString();
-            result["logout"] = Logout.ToString();
             result["position"] = Position.ToString();
             result["lookAt"] = LookAt.ToString();
-            result["HomeRegionID"] = HomeRegionID.ToString();
-            result["HomePosition"] = HomePosition.ToString();
-            result["HomeLookAt"] = HomeLookAt.ToString();
 
             return result;
         }
@@ -115,11 +96,10 @@ namespace OpenSim.Services.Interfaces
     public interface IPresenceService
     {
         bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID);
-        bool LogoutAgent(UUID sessionID, Vector3 position, Vector3 lookAt);
+        bool LogoutAgent(UUID sessionID);
         bool LogoutRegionAgents(UUID regionID);
 
-        bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt);
-        bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt);
+        bool ReportAgent(UUID sessionID, UUID regionID);
 
         PresenceInfo GetAgent(UUID sessionID);
         PresenceInfo[] GetAgents(string[] userIDs);
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index ee30fa3..d1dcfe7 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -215,7 +215,7 @@ namespace OpenSim.Services.LLLoginService
             SetDefaultValues();
         }
 
-        public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, PresenceInfo pinfo,
+        public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
             GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
             string where, string startlocation, Vector3 position, Vector3 lookAt, string message,
             GridRegion home, IPEndPoint clientIP)
@@ -283,7 +283,7 @@ namespace OpenSim.Services.LLLoginService
             }
         }
 
-        private void FillOutHomeData(PresenceInfo pinfo, GridRegion home)
+        private void FillOutHomeData(GridUserInfo pinfo, GridRegion home)
         {
             int x = 1000 * (int)Constants.RegionSize, y = 1000 * (int)Constants.RegionSize;
             if (home != null)
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index be90d38..f97222e 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -53,6 +53,7 @@ namespace OpenSim.Services.LLLoginService
         private static bool Initialized = false;
 
         protected IUserAccountService m_UserAccountService;
+        protected IGridUserService m_GridUserService;
         protected IAuthenticationService m_AuthenticationService;
         protected IInventoryService m_InventoryService;
         protected IGridService m_GridService;
@@ -82,6 +83,7 @@ namespace OpenSim.Services.LLLoginService
                 throw new Exception(String.Format("No section LoginService in config file"));
 
             string accountService = m_LoginServerConfig.GetString("UserAccountService", String.Empty);
+            string gridUserService = m_LoginServerConfig.GetString("GridUserService", String.Empty);
             string agentService = m_LoginServerConfig.GetString("UserAgentService", String.Empty);
             string authService = m_LoginServerConfig.GetString("AuthenticationService", String.Empty);
             string invService = m_LoginServerConfig.GetString("InventoryService", String.Empty);
@@ -105,8 +107,10 @@ namespace OpenSim.Services.LLLoginService
 
             Object[] args = new Object[] { config };
             m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
+            m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(gridUserService, args);
             m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authService, args);
             m_InventoryService = ServerUtils.LoadPlugin<IInventoryService>(invService, args);
+
             if (gridService != string.Empty)
                 m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
             if (presenceService != string.Empty)
@@ -271,8 +275,6 @@ namespace OpenSim.Services.LLLoginService
                 //
                 // Login the presence
                 //
-                PresenceInfo presence = null;
-                GridRegion home = null;
                 if (m_PresenceService != null)
                 {
                     success = m_PresenceService.LoginAgent(account.PrincipalID.ToString(), session, secureSession);
@@ -281,28 +283,35 @@ namespace OpenSim.Services.LLLoginService
                         m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: could not login presence");
                         return LLFailedLoginResponse.GridProblem;
                     }
-
-                    // Get the updated presence info
-                    presence = m_PresenceService.GetAgent(session);
-
-                    // Get the home region
-                    if ((presence.HomeRegionID != UUID.Zero) && m_GridService != null)
-                    {
-                        home = m_GridService.GetRegionByUUID(scopeID, presence.HomeRegionID);
-                    }
                 }
 
                 //
+                // Change Online status and get the home region
+                //
+                GridRegion home = null;
+                GridUserInfo guinfo = m_GridUserService.LoggedIn(account.PrincipalID.ToString());
+                if (guinfo != null && (guinfo.HomeRegionID != UUID.Zero) && m_GridService != null)
+                {
+                    home = m_GridService.GetRegionByUUID(scopeID, guinfo.HomeRegionID);
+                }
+                if (guinfo == null)
+                {
+                    // something went wrong, make something up, so that we don't have to test this anywhere else
+                    guinfo = new GridUserInfo();
+                    guinfo.LastPosition = guinfo.HomePosition = new Vector3(128, 128, 30);               
+                }
+                
+                //
                 // Find the destination region/grid
                 //
                 string where = string.Empty;
                 Vector3 position = Vector3.Zero;
                 Vector3 lookAt = Vector3.Zero;
                 GridRegion gatekeeper = null;
-                GridRegion destination = FindDestination(account, scopeID, presence, session, startLocation, out gatekeeper, out where, out position, out lookAt);
+                GridRegion destination = FindDestination(account, scopeID, guinfo, session, startLocation, home, out gatekeeper, out where, out position, out lookAt);
                 if (destination == null)
                 {
-                    m_PresenceService.LogoutAgent(session, presence.Position, presence.LookAt);
+                    m_PresenceService.LogoutAgent(session);
                     m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: destination not found");
                     return LLFailedLoginResponse.GridProblem;
                 }
@@ -324,7 +333,7 @@ namespace OpenSim.Services.LLLoginService
 
                 if (aCircuit == null)
                 {
-                    m_PresenceService.LogoutAgent(session, presence.Position, presence.LookAt);
+                    m_PresenceService.LogoutAgent(session);
                     m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: {0}", reason);
                     return LLFailedLoginResponse.AuthorizationProblem;
 
@@ -340,7 +349,7 @@ namespace OpenSim.Services.LLLoginService
                 //
                 // Finally, fill out the response and return it
                 //
-                LLLoginResponse response = new LLLoginResponse(account, aCircuit, presence, destination, inventorySkel, friendsList, m_LibraryService,
+                LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
                     where, startLocation, position, lookAt, m_WelcomeMessage, home, clientIP);
 
                 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
@@ -350,12 +359,12 @@ namespace OpenSim.Services.LLLoginService
             {
                 m_log.WarnFormat("[LLOGIN SERVICE]: Exception processing login for {0} {1}: {2} {3}", firstName, lastName, e.ToString(), e.StackTrace);
                 if (m_PresenceService != null)
-                    m_PresenceService.LogoutAgent(session, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
+                    m_PresenceService.LogoutAgent(session);
                 return LLFailedLoginResponse.InternalError;
             }
         }
 
-        protected GridRegion FindDestination(UserAccount account, UUID scopeID, PresenceInfo pinfo, UUID sessionID, string startLocation, out GridRegion gatekeeper, out string where, out Vector3 position, out Vector3 lookAt)
+        protected GridRegion FindDestination(UserAccount account, UUID scopeID, GridUserInfo pinfo, UUID sessionID, string startLocation, GridRegion home, out GridRegion gatekeeper, out string where, out Vector3 position, out Vector3 lookAt)
         {
             m_log.DebugFormat("[LLOGIN SERVICE]: FindDestination for start location {0}", startLocation);
 
@@ -377,7 +386,7 @@ namespace OpenSim.Services.LLLoginService
 
                 bool tryDefaults = false;
 
-                if (pinfo.HomeRegionID.Equals(UUID.Zero))
+                if (home == null)
                 {
                     m_log.WarnFormat(
                         "[LLOGIN SERVICE]: User {0} {1} tried to login to a 'home' start location but they have none set",
@@ -387,16 +396,10 @@ namespace OpenSim.Services.LLLoginService
                 }
                 else
                 {
-                    region = m_GridService.GetRegionByUUID(scopeID, pinfo.HomeRegionID);
+                    region = home;
 
-                    if (null == region)
-                    {
-                        m_log.WarnFormat(
-                            "[LLOGIN SERVICE]: User {0} {1} has a recorded home region of {2} but this cannot be found by the grid service", 
-                            account.FirstName, account.LastName, pinfo.HomeRegionID);
-                        
-                        tryDefaults = true;
-                    }
+                    position = pinfo.HomePosition;
+                    lookAt = pinfo.HomeLookAt;
                 }
                 
                 if (tryDefaults)
@@ -432,7 +435,7 @@ namespace OpenSim.Services.LLLoginService
 
                 GridRegion region = null;
 
-                if (pinfo.RegionID.Equals(UUID.Zero) || (region = m_GridService.GetRegionByUUID(scopeID, pinfo.RegionID)) == null)
+                if (pinfo.LastRegionID.Equals(UUID.Zero) || (region = m_GridService.GetRegionByUUID(scopeID, pinfo.LastRegionID)) == null)
                 {
                     List<GridRegion> defaults = m_GridService.GetDefaultRegions(scopeID);
                     if (defaults != null && defaults.Count > 0)
@@ -454,8 +457,8 @@ namespace OpenSim.Services.LLLoginService
                 }
                 else
                 {
-                    position = pinfo.Position;
-                    lookAt = pinfo.LookAt;
+                    position = pinfo.LastPosition;
+                    lookAt = pinfo.LastLookAt;
                 }
                 
                 return region;
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index ea8d673..7e7e98e 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -54,8 +54,6 @@ namespace OpenSim.Services.PresenceService
         public bool LoginAgent(string userID, UUID sessionID,
                 UUID secureSessionID)
         {
-            m_Database.Prune(userID);
-
             PresenceData[] d = m_Database.Get("UserID", userID);
 
             PresenceData data = new PresenceData();
@@ -65,24 +63,6 @@ namespace OpenSim.Services.PresenceService
             data.SessionID = sessionID;
             data.Data = new Dictionary<string, string>();
             data.Data["SecureSessionID"] = secureSessionID.ToString();
-            data.Data["Online"] = "true";
-            data.Data["Login"] = Util.UnixTimeSinceEpoch().ToString();
-            if (d != null && d.Length > 0)
-            {
-                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
-            {
-                data.Data["HomeRegionID"] = UUID.Zero.ToString();
-                data.Data["HomePosition"] = new Vector3(128, 128, 0).ToString();
-                data.Data["HomeLookAt"] = new Vector3(0, 1, 0).ToString();
-            }
             
             m_Database.Store(data);
 
@@ -91,28 +71,10 @@ namespace OpenSim.Services.PresenceService
             return true;
         }
 
-        public bool LogoutAgent(UUID sessionID, Vector3 position, Vector3 lookat)
+        public bool LogoutAgent(UUID sessionID)
         {
-            PresenceData data = m_Database.Get(sessionID);
-            if (data == null)
-                return false;
-
-            PresenceData[] d = m_Database.Get("UserID", data.UserID);
-
-            m_log.DebugFormat("[PRESENCE SERVICE]: LogoutAgent {0} with {1} sessions currently present", data.UserID, d.Length);
-            if (d.Length > 1)
-            {
-                m_Database.Delete("UserID", data.UserID);
-            }
-
-            data.Data["Online"] = "false";
-            data.Data["Logout"] = Util.UnixTimeSinceEpoch().ToString();
-            data.Data["Position"] = position.ToString();
-            data.Data["LookAt"] = lookat.ToString();
-
-            m_Database.Store(data);
-
-            return true;
+            m_log.DebugFormat("[PRESENCE SERVICE]: Session {0} logout", sessionID);
+            return m_Database.Delete("SessionID", sessionID.ToString());
         }
 
         public bool LogoutRegionAgents(UUID regionID)
@@ -123,7 +85,7 @@ namespace OpenSim.Services.PresenceService
         }
 
 
-        public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
+        public bool ReportAgent(UUID sessionID, UUID regionID)
         {
             m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID);
             try
@@ -134,14 +96,7 @@ namespace OpenSim.Services.PresenceService
                 if (pdata.Data == null)
                     return false;
 
-                if (!pdata.Data.ContainsKey("Online") || (pdata.Data.ContainsKey("Online") && pdata.Data["Online"] == "false"))
-                {
-                    m_log.WarnFormat("[PRESENCE SERVICE]: Someone tried to report presence of an agent who's not online");
-                    return false;
-                }
-
-                return m_Database.ReportAgent(sessionID, regionID,
-                            position.ToString(), lookAt.ToString());
+                return m_Database.ReportAgent(sessionID, regionID);
             }
             catch (Exception e)
             {
@@ -160,22 +115,10 @@ namespace OpenSim.Services.PresenceService
 
             ret.UserID = data.UserID;
             ret.RegionID = data.RegionID;
-            if (data.Data.ContainsKey("Online"))
-                ret.Online = bool.Parse(data.Data["Online"]);
-            if (data.Data.ContainsKey("Login"))
-                ret.Login = Util.ToDateTime(Convert.ToInt32(data.Data["Login"]));
-            if (data.Data.ContainsKey("Logout"))
-                ret.Logout = Util.ToDateTime(Convert.ToInt32(data.Data["Logout"]));
             if (data.Data.ContainsKey("Position"))
                 ret.Position = Vector3.Parse(data.Data["Position"]);
             if (data.Data.ContainsKey("LookAt"))
                 ret.LookAt = Vector3.Parse(data.Data["LookAt"]);
-            if (data.Data.ContainsKey("HomeRegionID"))
-                ret.HomeRegionID = new UUID(data.Data["HomeRegionID"]);
-            if (data.Data.ContainsKey("HomePosition"))
-                ret.HomePosition = Vector3.Parse(data.Data["HomePosition"]);
-            if (data.Data.ContainsKey("HomeLookAt"))
-                ret.HomeLookAt = Vector3.Parse(data.Data["HomeLookAt"]);
 
             return ret;
         }
@@ -195,16 +138,8 @@ namespace OpenSim.Services.PresenceService
 
                     ret.UserID = d.UserID;
                     ret.RegionID = d.RegionID;
-                    ret.Online = bool.Parse(d.Data["Online"]);
-                    ret.Login = Util.ToDateTime(Convert.ToInt32(
-                            d.Data["Login"]));
-                    ret.Logout = Util.ToDateTime(Convert.ToInt32(
-                            d.Data["Logout"]));
                     ret.Position = Vector3.Parse(d.Data["Position"]);
                     ret.LookAt = Vector3.Parse(d.Data["LookAt"]);
-                    ret.HomeRegionID = new UUID(d.Data["HomeRegionID"]);
-                    ret.HomePosition = Vector3.Parse(d.Data["HomePosition"]);
-                    ret.HomeLookAt = Vector3.Parse(d.Data["HomeLookAt"]);
 
                     info.Add(ret);
                 }
@@ -214,9 +149,5 @@ namespace OpenSim.Services.PresenceService
             return info.ToArray();
         }
 
-        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
-        {
-            return m_Database.SetHomeLocation(userID, regionID, position, lookAt);
-        }
     }
 }
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index c6e33bb..697ba63 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -31,6 +31,7 @@ using System.Reflection;
 using Nini.Config;
 using OpenSim.Data;
 using OpenSim.Services.Interfaces;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
@@ -50,27 +51,109 @@ namespace OpenSim.Services.UserAccountService
 
         public GridUserInfo GetGridUserInfo(string userID)
         {
-            GridUserData d = m_Database.GetGridUserData(userID);
-            
+            GridUserData d = m_Database.Get(userID);
+
+            if (d == null)
+                return null;
+
             GridUserInfo info = new GridUserInfo();
             info.UserID = d.UserID;
             info.HomeRegionID = new UUID(d.Data["HomeRegionID"]);
             info.HomePosition = Vector3.Parse(d.Data["HomePosition"]);
             info.HomeLookAt = Vector3.Parse(d.Data["HomeLookAt"]);
 
+            info.LastRegionID = new UUID(d.Data["LastRegionID"]);
+            info.LastPosition = Vector3.Parse(d.Data["LastPosition"]);
+            info.LastLookAt = Vector3.Parse(d.Data["LastLookAt"]);
+
+            info.Online = bool.Parse(d.Data["Online"]);
+            info.Login = Util.ToDateTime(Convert.ToInt32(d.Data["Login"]));
+            info.Logout = Util.ToDateTime(Convert.ToInt32(d.Data["Logout"]));
+
             return info;
         }
-        
-        public bool StoreGridUserInfo(GridUserInfo info)
+
+        public GridUserInfo LoggedIn(string userID)
+        {
+            m_log.DebugFormat("[GRID USER SERVICE]: User {0} is online", userID);
+            GridUserData d = m_Database.Get(userID);
+
+            if (d == null)
+            {
+                d = new GridUserData();
+                d.UserID = userID;
+            }
+
+            d.Data["Online"] = true.ToString();
+            d.Data["Login"] = Util.UnixTimeSinceEpoch().ToString();
+
+            m_Database.Store(d);
+
+            return GetGridUserInfo(userID);
+        }
+
+        public bool LoggedOut(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
+        {
+            m_log.DebugFormat("[GRID USER SERVICE]: User {0} is offline", userID);
+            GridUserData d = m_Database.Get(userID);
+
+            if (d == null)
+            {
+                d = new GridUserData();
+                d.UserID = userID;
+            }
+
+            d.Data["Online"] = false.ToString();
+            d.Data["Logout"] = Util.UnixTimeSinceEpoch().ToString();
+            d.Data["LastRegionID"] = regionID.ToString();
+            d.Data["LastPosition"] = lastPosition.ToString();
+            d.Data["LastLookAt"] = lastLookAt.ToString();
+
+            return m_Database.Store(d);
+        }
+
+        protected bool StoreGridUserInfo(GridUserInfo info)
         {
             GridUserData d = new GridUserData();
 
-            d.Data["UserID"] = info.UserID;
             d.Data["HomeRegionID"] = info.HomeRegionID.ToString();
             d.Data["HomePosition"] = info.HomePosition.ToString();
             d.Data["HomeLookAt"] = info.HomeLookAt.ToString();
 
-            return m_Database.StoreGridUserData(d);
+            return m_Database.Store(d);
+        }
+
+        public bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt)
+        {
+            GridUserData d = m_Database.Get(userID);
+            if (d == null)
+            {
+                d = new GridUserData();
+                d.UserID = userID;
+            }
+
+            d.Data["HomeRegionID"] = homeID.ToString();
+            d.Data["HomePosition"] = homePosition.ToString();
+            d.Data["HomeLookAt"] = homeLookAt.ToString();
+
+            return m_Database.Store(d);
+        }
+
+        public bool SetLastPosition(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
+        {
+            //m_log.DebugFormat("[Grid User Service]: SetLastPosition for {0}", userID);
+            GridUserData d = m_Database.Get(userID);
+            if (d == null)
+            {
+                d = new GridUserData();
+                d.UserID = userID;
+            }
+
+            d.Data["LastRegionID"] = regionID.ToString();
+            d.Data["LastPosition"] = lastPosition.ToString();
+            d.Data["LastLookAt"] = lastLookAt.ToString();
+
+            return m_Database.Store(d);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 35e2826..6923293 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Services.UserAccountService
 
         protected IGridService m_GridService;
         protected IAuthenticationService m_AuthenticationService;
-        protected IPresenceService m_PresenceService;
+        protected IGridUserService m_GridUserService;
         protected IInventoryService m_InventoryService;
 
         public UserAccountService(IConfigSource config)
@@ -69,9 +69,9 @@ namespace OpenSim.Services.UserAccountService
                 if (authServiceDll != string.Empty)
                     m_AuthenticationService = LoadPlugin<IAuthenticationService>(authServiceDll, new Object[] { config });
 
-                string presenceServiceDll = userConfig.GetString("PresenceService", string.Empty);
+                string presenceServiceDll = userConfig.GetString("GridUserService", string.Empty);
                 if (presenceServiceDll != string.Empty)
-                    m_PresenceService = LoadPlugin<IPresenceService>(presenceServiceDll, new Object[] { config });
+                    m_GridUserService = LoadPlugin<IGridUserService>(presenceServiceDll, new Object[] { config });
 
                 string invServiceDll = userConfig.GetString("InventoryService", string.Empty);
                 if (invServiceDll != string.Empty)
@@ -333,8 +333,8 @@ namespace OpenSim.Services.UserAccountService
                         if (defaultRegions != null && defaultRegions.Count >= 1)
                             home = defaultRegions[0];
 
-                        if (m_PresenceService != null && home != null)
-                            m_PresenceService.SetHomeLocation(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
+                        if (m_GridUserService != null && home != null)
+                            m_GridUserService.SetHome(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
                         else
                             m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to set home for account {0} {1}.",
                                firstName, lastName);
diff --git a/OpenSim/Tests/Clients/Presence/PresenceClient.cs b/OpenSim/Tests/Clients/Presence/PresenceClient.cs
index 4f959f6..0f6b80e 100644
--- a/OpenSim/Tests/Clients/Presence/PresenceClient.cs
+++ b/OpenSim/Tests/Clients/Presence/PresenceClient.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Tests.Clients.PresenceClient
                     pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID);
 
             System.Console.WriteLine("\n");
-            success = m_Connector.ReportAgent(session1, region1, new Vector3(128, 128, 128), new Vector3(4, 5, 6));
+            success = m_Connector.ReportAgent(session1, region1);
             if (success)
                 m_log.InfoFormat("[PRESENCE CLIENT]: Successfully reported session {0} in region {1}", user1, region1);
             else
@@ -90,20 +90,7 @@ namespace OpenSim.Tests.Clients.PresenceClient
                     pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID);
 
             System.Console.WriteLine("\n");
-            success = m_Connector.SetHomeLocation(user1.ToString(), region1, new Vector3(128, 128, 128), new Vector3(4, 5, 6));
-            if (success)
-                m_log.InfoFormat("[PRESENCE CLIENT]: Successfully set home for user {0} in region {1}", user1, region1);
-            else
-                m_log.InfoFormat("[PRESENCE CLIENT]: failed to set home for user {0}", user1);
-            pinfo = m_Connector.GetAgent(session1);
-            if (pinfo == null)
-                m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0} for third time", user1);
-            else
-                m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}",
-                    pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID);
-
-            System.Console.WriteLine("\n");
-            success = m_Connector.LogoutAgent(session1, Vector3.Zero, Vector3.UnitY);
+            success = m_Connector.LogoutAgent(session1);
             if (success)
                 m_log.InfoFormat("[PRESENCE CLIENT]: Successfully logged out user {0}", user1);
             else
@@ -116,7 +103,7 @@ namespace OpenSim.Tests.Clients.PresenceClient
                     pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID);
 
             System.Console.WriteLine("\n");
-            success = m_Connector.ReportAgent(session1, UUID.Random(), Vector3.Zero, Vector3.Zero);
+            success = m_Connector.ReportAgent(session1, UUID.Random());
             if (success)
                 m_log.InfoFormat("[PRESENCE CLIENT]: Report agent succeeded, but this is wrong");
             else