29 files changed, 3332 insertions, 3103 deletions

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

+ * Copyright (c) Contributors

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

+ *

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

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

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

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

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

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

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

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ */

+

+using System;

+using System.Collections.Generic;

+using System.Text;

+using System.IO;

+

+namespace PrimMesher

+{

+    public struct Quat

+    {

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

+        public float X;

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

+        public float Y;

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

+        public float Z;

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

+        public float W;

+

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

+        {

+            X = x;

+            Y = y;

+            Z = z;

+            W = w;

+        }

+

+        public Quat(Coord axis, float angle)

+        {

+            axis = axis.Normalize();

+

+            angle *= 0.5f;

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

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

+

+            X = axis.X * s;

+            Y = axis.Y * s;

+            Z = axis.Z * s;

+            W = c;

+

+            Normalize();

+        }

+

+        public float Length()

+        {

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

+        }

+

+        public Quat Normalize()

+        {

+            const float MAG_THRESHOLD = 0.0000001f;

+            float mag = Length();

+

+            // Catch very small rounding errors when normalizing

+            if (mag > MAG_THRESHOLD)

+            {

+                float oomag = 1f / mag;

+                X *= oomag;

+                Y *= oomag;

+                Z *= oomag;

+                W *= oomag;

+            }

+            else

+            {

+                X = 0f;

+                Y = 0f;

+                Z = 0f;

+                W = 1f;

+            }

+

+            return this;

+        }

+

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

+        {

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

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

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

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

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

+        }

+

+        public override string ToString()

+        {

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

+        }

+    }

+

+    public struct Coord

+    {

+        public float X;

+        public float Y;

+        public float Z;

+

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

+        {

+            this.X = x;

+            this.Y = y;

+            this.Z = z;

+        }

+

+        public float Length()

+        {

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

+        }

+

+        public Coord Invert()

+        {

+            this.X = -this.X;

+            this.Y = -this.Y;

+            this.Z = -this.Z;

+

+            return this;

+        }

+

+        public Coord Normalize()

+        {

+            const float MAG_THRESHOLD = 0.0000001f;

+            float mag = Length();

+

+            // Catch very small rounding errors when normalizing

+            if (mag > MAG_THRESHOLD)

+            {

+                float oomag = 1.0f / mag;

+                this.X *= oomag;

+                this.Y *= oomag;

+                this.Z *= oomag;

+            }

+            else

+            {

+                this.X = 0.0f;

+                this.Y = 0.0f;

+                this.Z = 0.0f;

+            }

+

+            return this;

+        }

+

+        public override string ToString()

+        {

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

+        }

+

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

+        {

+            return new Coord(

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

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

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

+                );

+        }

+

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

+        {

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

+        }

+

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

+        {

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

+        }

+

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

+        {

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

+

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

+

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

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

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

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

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

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

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

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

+

+            c2.Y =

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

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

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

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

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

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

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

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

+

+            c2.Z =

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

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

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

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

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

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

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

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

+

+            return c2;

+        }

+    }

+

+    public struct UVCoord

+    {

+        public float U;

+        public float V;

+

+

+        public UVCoord(float u, float v)

+        {

+            this.U = u;

+            this.V = v;

+        }

+    }

+

+    public struct Face

+    {

+        public int primFace;

+

+        // vertices

+        public int v1;

+        public int v2;

+        public int v3;

+

+        //normals

+        public int n1;

+        public int n2;

+        public int n3;

+

+        // uvs

+        public int uv1;

+        public int uv2;

+        public int uv3;

+

+

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

+        {

+            primFace = 0;

+

+            this.v1 = v1;

+            this.v2 = v2;

+            this.v3 = v3;

+

+            this.n1 = 0;

+            this.n2 = 0;

+            this.n3 = 0;

+

+            this.uv1 = 0;

+            this.uv2 = 0;

+            this.uv3 = 0;

+

+        }

+

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

+        {

+            primFace = 0;

+

+            this.v1 = v1;

+            this.v2 = v2;

+            this.v3 = v3;

+

+            this.n1 = n1;

+            this.n2 = n2;

+            this.n3 = n3;

+

+            this.uv1 = 0;

+            this.uv2 = 0;

+            this.uv3 = 0;

+        }

+

+        public Coord SurfaceNormal(List<Coord> coordList)

+        {

+            Coord c1 = coordList[this.v1];

+            Coord c2 = coordList[this.v2];

+            Coord c3 = coordList[this.v3];

+

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

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

+

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

+        }

+    }

+

+    public struct ViewerFace

+    {

+        public int primFaceNumber;

+

+        public Coord v1;

+        public Coord v2;

+        public Coord v3;

+

+        public int coordIndex1;

+        public int coordIndex2;

+        public int coordIndex3;

+

+        public Coord n1;

+        public Coord n2;

+        public Coord n3;

+

+        public UVCoord uv1;

+        public UVCoord uv2;

+        public UVCoord uv3;

+

+        public ViewerFace(int primFaceNumber)

+        {

+            this.primFaceNumber = primFaceNumber;

+

+            this.v1 = new Coord();

+            this.v2 = new Coord();

+            this.v3 = new Coord();

+

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

+

+            this.n1 = new Coord();

+            this.n2 = new Coord();

+            this.n3 = new Coord();

+

+            this.uv1 = new UVCoord();

+            this.uv2 = new UVCoord();

+            this.uv3 = new UVCoord();

+        }

+

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

+        {

+            this.v1.X *= x;

+            this.v1.Y *= y;

+            this.v1.Z *= z;

+

+            this.v2.X *= x;

+            this.v2.Y *= y;

+            this.v2.Z *= z;

+

+            this.v3.X *= x;

+            this.v3.Y *= y;

+            this.v3.Z *= z;

+        }

+

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

+        {

+            this.v1.X += x;

+            this.v2.X += x;

+            this.v3.X += x;

+

+            this.v1.Y += y;

+            this.v2.Y += y;

+            this.v3.Y += y;

+

+            this.v1.Z += z;

+            this.v2.Z += z;

+            this.v3.Z += z;

+        }

+

+        public void AddRot(Quat q)

+        {

+            this.v1 *= q;

+            this.v2 *= q;

+            this.v3 *= q;

+

+            this.n1 *= q;

+            this.n2 *= q;

+            this.n3 *= q;

+        }

+

+        public void CalcSurfaceNormal()

+        {

+

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

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

+

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

+        }

+    }

+

+    internal struct Angle

+    {

+        internal float angle;

+        internal float X;

+        internal float Y;

+

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

+        {

+            this.angle = angle;

+            this.X = x;

+            this.Y = y;

+        }

+    }

+

+    internal class AngleList

+    {

+        private float iX, iY; // intersection point

+

+        private static Angle[] angles3 =

+        {

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

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

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

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

+        };

+

+        private static Coord[] normals3 =

+        {

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

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

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

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

+        };

+

+        private static Angle[] angles4 =

+        {

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

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

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

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

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

+        };

+

+        private static Coord[] normals4 = 

+        {

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

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

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

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

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

+        };

+

+        private static Angle[] angles24 =

+        {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+        };

+

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

+        {

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

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

+        }

+

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

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

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

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

+

+            if (denom != 0.0)

+            {

+                double ua = uaNumerator / denom;

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

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

+            }

+        }

+

+        internal List<Angle> angles;

+        internal List<Coord> normals;

+

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

+        {

+            angles = new List<Angle>();

+            normals = new List<Coord>();

+

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

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

+

+            if (sides < 1)

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

+            if (stopAngle <= startAngle)

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

+

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

+            {

+                startAngle *= twoPiInv;

+                stopAngle *= twoPiInv;

+

+                Angle[] sourceAngles;

+                if (sides == 3)

+                    sourceAngles = angles3;

+                else if (sides == 4)

+                    sourceAngles = angles4;

+                else sourceAngles = angles24;

+

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

+                int endAngleIndex = sourceAngles.Length - 1;

+                if (stopAngle < 1.0f)

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

+                if (endAngleIndex == startAngleIndex)

+                    endAngleIndex++;

+

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

+                {

+                    angles.Add(sourceAngles[angleIndex]);

+                    if (sides == 3)

+                        normals.Add(normals3[angleIndex]);

+                    else if (sides == 4)

+                        normals.Add(normals4[angleIndex]);

+                }

+

+                if (startAngle > 0.0f)

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

+

+                if (stopAngle < 1.0f)

+                {

+                    int lastAngleIndex = angles.Count - 1;

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

+                }

+            }

+            else

+            {

+                double stepSize = twoPi / sides;

+

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

+                double angle = stepSize * startStep;

+                int step = startStep;

+                double stopAngleTest = stopAngle;

+                if (stopAngle < twoPi)

+                {

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

+                    if (stopAngleTest < stopAngle)

+                        stopAngleTest += stepSize;

+                    if (stopAngleTest > twoPi)

+                        stopAngleTest = twoPi;

+                }

+

+                while (angle <= stopAngleTest)

+                {

+                    Angle newAngle;

+                    newAngle.angle = (float)angle;

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

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

+                    angles.Add(newAngle);

+                    step += 1;

+                    angle = stepSize * step;

+                }

+

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

+                {

+                    Angle newAngle;

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

+                    newAngle.angle = startAngle;

+                    newAngle.X = iX;

+                    newAngle.Y = iY;

+                    angles[0] = newAngle;

+                }

+

+                int index = angles.Count - 1;

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

+                {

+                    Angle newAngle;

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

+                    newAngle.angle = stopAngle;

+                    newAngle.X = iX;

+                    newAngle.Y = iY;

+                    angles[index] = newAngle;

+                }

+            }

+        }

+    }

+

+    /// <summary>

+    /// generates a profile for extrusion

+    /// </summary>

+    internal class Profile

+    {

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

+

+        internal string errorMessage = null;

+

+        internal List<Coord> coords;

+        internal List<Face> faces;

+        internal List<Coord> vertexNormals;

+        internal List<float> us;

+        internal List<UVCoord> faceUVs;

+        internal List<int> faceNumbers;

+

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

+        internal List<int> outerCoordIndices = null;

+        internal List<int> hollowCoordIndices = null;

+        internal List<int> cut1CoordIndices = null;

+        internal List<int> cut2CoordIndices = null;

+

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

+        internal Coord cutNormal1 = new Coord();

+        internal Coord cutNormal2 = new Coord();

+

+        internal int numOuterVerts = 0;

+        internal int numHollowVerts = 0;

+

+        internal bool calcVertexNormals = false;

+        internal int bottomFaceNumber = 0;

+        internal int numPrimFaces = 0;

+

+        internal Profile()

+        {

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

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

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

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

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

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

+        }

+

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

+        {

+            this.calcVertexNormals = calcVertexNormals;

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

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

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

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

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

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

+

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

+            //bool hasCenter = false;

+

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

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

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

+

+            if (calcVertexNormals)

+            {

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

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

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

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

+            }

+

+            bool hasHollow = (hollow > 0.0f);

+

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

+

+            AngleList angles = new AngleList();

+            AngleList hollowAngles = new AngleList();

+

+            float xScale = 0.5f;

+            float yScale = 0.5f;

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

+            {

+                xScale = 0.707f;

+                yScale = 0.707f;

+            }

+

+            float startAngle = profileStart * twoPi;

+            float stopAngle = profileEnd * twoPi;

+

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

+            catch (Exception ex)

+            {

+

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

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

+

+                return;

+            }

+

+            this.numOuterVerts = angles.angles.Count;

+

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

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

+

+            if (hasHollow)

+            {

+                if (sides == hollowSides)

+                    hollowAngles = angles;

+                else

+                {

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

+                    catch (Exception ex)

+                    {

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

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

+

+                        return;

+                    }

+                }

+                this.numHollowVerts = hollowAngles.angles.Count;

+            }

+            else if (!simpleFace)

+            {

+                this.coords.Add(center);

+                //hasCenter = true;

+                if (this.calcVertexNormals)

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

+                this.us.Add(0.0f);

+            }

+

+            float z = 0.0f;

+

+            Angle angle;

+            Coord newVert = new Coord();

+            if (hasHollow && hollowSides != sides)

+            {

+                int numHollowAngles = hollowAngles.angles.Count;

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

+                {

+                    angle = hollowAngles.angles[i];

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

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

+                    newVert.Z = z;

+

+                    hollowCoords.Add(newVert);

+                    if (this.calcVertexNormals)

+                    {

+                        if (hollowSides < 5)

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

+                        else

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

+

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

+                    }

+                }

+            }

+

+            int index = 0;

+            int numAngles = angles.angles.Count;

+

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

+            {

+                angle = angles.angles[i];

+                newVert.X = angle.X * xScale;

+                newVert.Y = angle.Y * yScale;

+                newVert.Z = z;

+                this.coords.Add(newVert);

+                if (this.calcVertexNormals)

+                {

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

+

+                    if (sides < 5)

+                    {

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

+                        float u = angle.angle;

+                        this.us.Add(u);

+                    }

+                    else

+                    {

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

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

+                    }

+                }

+

+                if (hasHollow)

+                {

+                    if (hollowSides == sides)

+                    {

+                        newVert.X *= hollow;

+                        newVert.Y *= hollow;

+                        newVert.Z = z;

+                        hollowCoords.Add(newVert);

+                        if (this.calcVertexNormals)

+                        {

+                            if (sides < 5)

+                            {

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

+                            }

+

+                            else

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

+

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

+                        }

+                    }

+                }

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

+                {

+                    Face newFace = new Face();

+                    newFace.v1 = 0;

+                    newFace.v2 = index;

+                    newFace.v3 = index + 1;

+

+                    this.faces.Add(newFace);

+                }

+                index += 1;

+            }

+

+            if (hasHollow)

+            {

+                hollowCoords.Reverse();

+                if (this.calcVertexNormals)

+                {

+                    hollowNormals.Reverse();

+                    hollowUs.Reverse();

+                }

+

+                if (createFaces)

+                {

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

+                    //numOuterVerts = this.coords.Count;

+                    //int numHollowVerts = hollowCoords.Count;

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

+

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

+                    {

+                        Face newFace = new Face();

+

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

+                        {

+                            newFace.v1 = coordIndex;

+                            newFace.v2 = coordIndex + 1;

+                            newFace.v3 = numTotalVerts - coordIndex - 1;

+                            this.faces.Add(newFace);

+

+                            newFace.v1 = coordIndex + 1;

+                            newFace.v2 = numTotalVerts - coordIndex - 2;

+                            newFace.v3 = numTotalVerts - coordIndex - 1;

+                            this.faces.Add(newFace);

+                        }

+                    }

+                    else

+                    {

+                        if (this.numOuterVerts < this.numHollowVerts)

+                        {

+                            Face newFace = new Face();

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

+                            int maxJ = this.numOuterVerts - 1;

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

+                            {

+                                if (j < maxJ)

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

+                                    {

+                                        newFace.v1 = numTotalVerts - i - 1;

+                                        newFace.v2 = j;

+                                        newFace.v3 = j + 1;

+

+                                        this.faces.Add(newFace);

+                                        j += 1;

+                                    }

+

+                                newFace.v1 = j;

+                                newFace.v2 = numTotalVerts - i - 2;

+                                newFace.v3 = numTotalVerts - i - 1;

+

+                                this.faces.Add(newFace);

+                            }

+                        }

+                        else // numHollowVerts < numOuterVerts

+                        {

+                            Face newFace = new Face();

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

+                            int maxJ = this.numHollowVerts - 1;

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

+                            {

+                                if (j < maxJ)

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

+                                    {

+                                        newFace.v1 = i;

+                                        newFace.v2 = numTotalVerts - j - 2;

+                                        newFace.v3 = numTotalVerts - j - 1;

+

+                                        this.faces.Add(newFace);

+                                        j += 1;

+                                    }

+

+                                newFace.v1 = numTotalVerts - j - 1;

+                                newFace.v2 = i;

+                                newFace.v3 = i + 1;

+

+                                this.faces.Add(newFace);

+                            }

+                        }

+                    }

+                }

+

+                if (calcVertexNormals)

+                {

+                    foreach (Coord hc in hollowCoords)

+                    {

+                        this.coords.Add(hc);

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

+                    }

+                }

+                else

+                    this.coords.AddRange(hollowCoords);

+

+                if (this.calcVertexNormals)

+                {

+                    this.vertexNormals.AddRange(hollowNormals);

+                    this.us.AddRange(hollowUs);

+

+                }

+            }

+

+            if (simpleFace && createFaces)

+            {

+                if (sides == 3)

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

+                else if (sides == 4)

+                {

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

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

+                }

+            }

+

+            if (calcVertexNormals && hasProfileCut)

+            {

+                if (hasHollow)

+                {

+                    int lastOuterVertIndex = this.numOuterVerts - 1;

+

+                    this.cut1CoordIndices.Add(0);

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

+

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

+                    this.cut2CoordIndices.Add(lastOuterVertIndex);

+

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

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

+

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

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

+                }

+

+                else

+                {

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

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

+

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

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

+

+                }

+                this.cutNormal1.Normalize();

+                this.cutNormal2.Normalize();

+            }

+

+            this.MakeFaceUVs();

+

+            hollowCoords = null;

+            hollowNormals = null;

+            hollowUs = null;

+

+            if (calcVertexNormals)

+            { // calculate prim face numbers

+

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

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

+

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

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

+                if (startVert > 0)

+                    this.faceNumbers.Add(-1);

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

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

+

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

+                //    this.bottomFaceNumber = faceNum++;

+

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

+

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

+                    faceNum++;

+

+                if (hasHollow)

+                {

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

+                        this.faceNumbers.Add(faceNum);

+

+                    faceNum++;

+                }

+                //if (hasProfileCut || hasHollow)

+                //    this.bottomFaceNumber = faceNum++;

+                this.bottomFaceNumber = faceNum++;

+

+                if (hasHollow && hasProfileCut)

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

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

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

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

+

+

+                this.numPrimFaces = faceNum;

+            }

+

+        }

+

+        internal void MakeFaceUVs()

+        {

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

+            foreach (Coord c in this.coords)

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

+        }

+

+        internal Profile Copy()

+        {

+            return this.Copy(true);

+        }

+

+        internal Profile Copy(bool needFaces)

+        {

+            Profile copy = new Profile();

+

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

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

+

+            if (needFaces)

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

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

+            {

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

+                copy.faceNormal = this.faceNormal;

+                copy.cutNormal1 = this.cutNormal1;

+                copy.cutNormal2 = this.cutNormal2;

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

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

+

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

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

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

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

+            }

+            copy.numOuterVerts = this.numOuterVerts;

+            copy.numHollowVerts = this.numHollowVerts;

+

+            return copy;

+        }

+

+        internal void AddPos(Coord v)

+        {

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

+        }

+

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

+        {

+            int i;

+            int numVerts = this.coords.Count;

+            Coord vert;

+

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

+            {

+                vert = this.coords[i];

+                vert.X += x;

+                vert.Y += y;

+                vert.Z += z;

+                this.coords[i] = vert;

+            }

+        }

+

+        internal void AddRot(Quat q)

+        {

+            int i;

+            int numVerts = this.coords.Count;

+

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

+                this.coords[i] *= q;

+

+            if (this.calcVertexNormals)

+            {

+                int numNormals = this.vertexNormals.Count;

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

+                    this.vertexNormals[i] *= q;

+

+                this.faceNormal *= q;

+                this.cutNormal1 *= q;

+                this.cutNormal2 *= q;

+

+            }

+        }

+

+        internal void Scale(float x, float y)

+        {

+            int i;

+            int numVerts = this.coords.Count;

+            Coord vert;

+

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

+            {

+                vert = this.coords[i];

+                vert.X *= x;

+                vert.Y *= y;

+                this.coords[i] = vert;

+            }

+        }

+

+        /// <summary>

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

+        /// </summary>

+        internal void FlipNormals()

+        {

+            int i;

+            int numFaces = this.faces.Count;

+            Face tmpFace;

+            int tmp;

+

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

+            {

+                tmpFace = this.faces[i];

+                tmp = tmpFace.v3;

+                tmpFace.v3 = tmpFace.v1;

+                tmpFace.v1 = tmp;

+                this.faces[i] = tmpFace;

+            }

+

+            if (this.calcVertexNormals)

+            {

+                int normalCount = this.vertexNormals.Count;

+                if (normalCount > 0)

+                {

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

+                    n.Z = -n.Z;

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

+                }

+            }

+

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

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

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

+

+            int numfaceUVs = this.faceUVs.Count;

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

+            {

+                UVCoord uv = this.faceUVs[i];

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

+                this.faceUVs[i] = uv;

+            }

+        }

+

+        internal void AddValue2FaceVertexIndices(int num)

+        {

+            int numFaces = this.faces.Count;

+            Face tmpFace;

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

+            {

+                tmpFace = this.faces[i];

+                tmpFace.v1 += num;

+                tmpFace.v2 += num;

+                tmpFace.v3 += num;

+

+                this.faces[i] = tmpFace;

+            }

+        }

+

+        internal void AddValue2FaceNormalIndices(int num)

+        {

+            if (this.calcVertexNormals)

+            {

+                int numFaces = this.faces.Count;

+                Face tmpFace;

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

+                {

+                    tmpFace = this.faces[i];

+                    tmpFace.n1 += num;

+                    tmpFace.n2 += num;

+                    tmpFace.n3 += num;

+

+                    this.faces[i] = tmpFace;

+                }

+            }

+        }

+

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

+        {

+            if (path == null)

+                return;

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

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

+            StreamWriter sw = new StreamWriter(completePath);

+

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

+            {

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

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

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

+

+                sw.WriteLine(s);

+            }

+

+            sw.Close();

+        }

+    }

+

+    public struct PathNode

+    {

+        public Coord position;

+        public Quat rotation;

+        public float xScale;

+        public float yScale;

+        public float percentOfPath;

+    }

+

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

+

+    public class Path

+    {

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

+

+        public float twistBegin = 0.0f;

+        public float twistEnd = 0.0f;

+        public float topShearX = 0.0f;

+        public float topShearY = 0.0f;

+        public float pathCutBegin = 0.0f;

+        public float pathCutEnd = 1.0f;

+        public float dimpleBegin = 0.0f;

+        public float dimpleEnd = 1.0f;

+        public float skew = 0.0f;

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

+        public float holeSizeY = 0.25f;

+        public float taperX = 0.0f;

+        public float taperY = 0.0f;

+        public float radius = 0.0f;

+        public float revolutions = 1.0f;

+        public int stepsPerRevolution = 24;

+

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

+

+        public void Create(PathType pathType, int steps)

+        {

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

+            {

+                int step = 0;

+

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

+                float twistTotal = twistEnd - twistBegin;

+                float twistTotalAbs = Math.Abs(twistTotal);

+                if (twistTotalAbs > 0.01f)

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

+

+                float start = -0.5f;

+                float stepSize = length / (float)steps;

+                float percentOfPathMultiplier = stepSize;

+                float xOffset = 0.0f;

+                float yOffset = 0.0f;

+                float zOffset = start;

+                float xOffsetStepIncrement = this.topShearX / steps;

+                float yOffsetStepIncrement = this.topShearY / steps;

+

+                float percentOfPath = this.pathCutBegin;

+                zOffset += percentOfPath;

+

+                // sanity checks

+

+                bool done = false;

+

+                while (!done)

+                {

+                    PathNode newNode = new PathNode();

+

+                    newNode.xScale = 1.0f;

+                    if (this.taperX == 0.0f)

+                        newNode.xScale = 1.0f;

+                    else if (this.taperX > 0.0f)

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

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

+

+                    newNode.yScale = 1.0f;

+                    if (this.taperY == 0.0f)

+                        newNode.yScale = 1.0f;

+                    else if (this.taperY > 0.0f)

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

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

+

+                    float twist = twistBegin + twistTotal * percentOfPath;

+

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

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

+                    newNode.percentOfPath = percentOfPath;

+

+                    pathNodes.Add(newNode);

+

+                    if (step < steps)

+                    {

+                        step += 1;

+                        percentOfPath += percentOfPathMultiplier;

+                        xOffset += xOffsetStepIncrement;

+                        yOffset += yOffsetStepIncrement;

+                        zOffset += stepSize;

+                        if (percentOfPath > this.pathCutEnd)

+                            done = true;

+                    }

+                    else done = true;

+                }

+            } // end of linear path code

+

+            else // pathType == Circular

+            {

+                float twistTotal = twistEnd - twistBegin;

+

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

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

+                // accurately match the viewer

+                float twistTotalAbs = Math.Abs(twistTotal);

+                if (twistTotalAbs > 0.01f)

+                {

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

+                        steps *= 2;

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

+                        steps *= 2;

+                }

+

+                float yPathScale = this.holeSizeY * 0.5f;

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

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

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

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

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

+

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

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

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

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

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

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

+                // displayed by the viewer.

+

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

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

+                float stepSize = twoPi / this.stepsPerRevolution;

+

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

+                float angle = startAngle;

+

+                bool done = false;

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

+                {

+                    PathNode newNode = new PathNode();

+

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

+                    float yProfileScale = this.holeSizeY;

+

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

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

+

+                    if (this.taperX > 0.01f)

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

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

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

+

+                    if (this.taperY > 0.01f)

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

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

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

+

+                    newNode.xScale = xProfileScale;

+                    newNode.yScale = yProfileScale;

+

+                    float radiusScale = 1.0f;

+                    if (this.radius > 0.001f)

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

+                    else if (this.radius < 0.001f)

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

+

+                    float twist = twistBegin + twistTotal * percentOfPath;

+

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

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

+

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

+

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

+

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

+

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

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

+

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

+

+                    // next apply twist rotation to the profile layer

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

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

+

+                    newNode.percentOfPath = percentOfPath;

+

+                    pathNodes.Add(newNode);

+

+                    // calculate terms for next iteration

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

+

+                    if (angle >= endAngle - 0.01)

+                        done = true;

+                    else

+                    {

+                        step += 1;

+                        angle = stepSize * step;

+                        if (angle > endAngle)

+                            angle = endAngle;

+                    }

+                }

+            }

+        }

+    }

+

+    public class PrimMesh

+    {

+        public string errorMessage = "";

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

+

+        public List<Coord> coords;

+        public List<Coord> normals;

+        public List<Face> faces;

+

+        public List<ViewerFace> viewerFaces;

+

+        private int sides = 4;

+        private int hollowSides = 4;

+        private float profileStart = 0.0f;

+        private float profileEnd = 1.0f;

+        private float hollow = 0.0f;

+        public int twistBegin = 0;

+        public int twistEnd = 0;

+        public float topShearX = 0.0f;

+        public float topShearY = 0.0f;

+        public float pathCutBegin = 0.0f;

+        public float pathCutEnd = 1.0f;

+        public float dimpleBegin = 0.0f;

+        public float dimpleEnd = 1.0f;

+        public float skew = 0.0f;

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

+        public float holeSizeY = 0.25f;

+        public float taperX = 0.0f;

+        public float taperY = 0.0f;

+        public float radius = 0.0f;

+        public float revolutions = 1.0f;

+        public int stepsPerRevolution = 24;

+

+        private bool hasProfileCut = false;

+        private bool hasHollow = false;

+        public bool calcVertexNormals = false;

+        private bool normalsProcessed = false;

+        public bool viewerMode = false;

+

+        public int numPrimFaces = 0;

+

+        /// <summary>

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

+        /// </summary>

+        /// <returns></returns>

+        public string ParamsToDisplayString()

+        {

+            string s = "";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+

+            return s;

+        }

+

+        /// <summary>

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

+        /// </summary>

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

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

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

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

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

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

+        {

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

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

+

+            this.sides = sides;

+            this.profileStart = profileStart;

+            this.profileEnd = profileEnd;

+            this.hollow = hollow;

+            this.hollowSides = hollowSides;

+

+            if (sides < 3)

+                this.sides = 3;

+            if (hollowSides < 3)

+                this.hollowSides = 3;

+            if (profileStart < 0.0f)

+                this.profileStart = 0.0f;

+            if (profileEnd > 1.0f)

+                this.profileEnd = 1.0f;

+            if (profileEnd < 0.02f)

+                this.profileEnd = 0.02f;

+            if (profileStart >= profileEnd)

+                this.profileStart = profileEnd - 0.02f;

+            if (hollow > 0.99f)

+                this.hollow = 0.99f;

+            if (hollow < 0.0f)

+                this.hollow = 0.0f;

+

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

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

+        }

+

+        /// <summary>

+        /// Extrudes a profile along a path.

+        /// </summary>

+        public void Extrude(PathType pathType)

+        {

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

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

+

+            if (this.viewerMode)

+            {

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

+                this.calcVertexNormals = true;

+            }

+

+            if (this.calcVertexNormals)

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

+

+            int steps = 1;

+

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

+            normalsProcessed = false;

+

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

+            {

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

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

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

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

+            }

+

+

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

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

+            float twistTotal = twistEnd - twistBegin;

+            float twistTotalAbs = Math.Abs(twistTotal);

+            if (twistTotalAbs > 0.01f)

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

+

+            float hollow = this.hollow;

+

+            // sanity checks

+            float initialProfileRot = 0.0f;

+            if (pathType == PathType.Circular)

+            {

+                if (this.sides == 3)

+                {

+                    initialProfileRot = (float)Math.PI;

+                    if (this.hollowSides == 4)

+                    {

+                        if (hollow > 0.7f)

+                            hollow = 0.7f;

+                        hollow *= 0.707f;

+                    }

+                    else hollow *= 0.5f;

+                }

+                else if (this.sides == 4)

+                {

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

+                    if (this.hollowSides != 4)

+                        hollow *= 0.707f;

+                }

+                else if (this.sides > 4)

+                {

+                    initialProfileRot = (float)Math.PI;

+                    if (this.hollowSides == 4)

+                    {

+                        if (hollow > 0.7f)

+                            hollow = 0.7f;

+                        hollow /= 0.7f;

+                    }

+                }

+            }

+            else

+            {

+                if (this.sides == 3)

+                {

+                    if (this.hollowSides == 4)

+                    {

+                        if (hollow > 0.7f)

+                            hollow = 0.7f;

+                        hollow *= 0.707f;

+                    }

+                    else hollow *= 0.5f;

+                }

+                else if (this.sides == 4)

+                {

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

+                    if (this.hollowSides != 4)

+                        hollow *= 0.707f;

+                }

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

+                    hollow *= 1.414f;

+            }

+

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

+            this.errorMessage = profile.errorMessage;

+

+            this.numPrimFaces = profile.numPrimFaces;

+

+            int cut1Vert = -1;

+            int cut2Vert = -1;

+            if (hasProfileCut)

+            {

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

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

+            }

+

+            if (initialProfileRot != 0.0f)

+            {

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

+                if (viewerMode)

+                    profile.MakeFaceUVs();

+            }

+

+            Coord lastCutNormal1 = new Coord();

+            Coord lastCutNormal2 = new Coord();

+            float lastV = 1.0f;

+

+            Path path = new Path();

+            path.twistBegin = twistBegin;

+            path.twistEnd = twistEnd;

+            path.topShearX = topShearX;

+            path.topShearY = topShearY;

+            path.pathCutBegin = pathCutBegin;

+            path.pathCutEnd = pathCutEnd;

+            path.dimpleBegin = dimpleBegin;

+            path.dimpleEnd = dimpleEnd;

+            path.skew = skew;

+            path.holeSizeX = holeSizeX;

+            path.holeSizeY = holeSizeY;

+            path.taperX = taperX;

+            path.taperY = taperY;

+            path.radius = radius;

+            path.revolutions = revolutions;

+            path.stepsPerRevolution = stepsPerRevolution;

+

+            path.Create(pathType, steps);

+

+            bool needEndFaces = false;

+            if (pathType == PathType.Circular)

+            {

+                needEndFaces = false;

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

+                    needEndFaces = true;

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

+                    needEndFaces = true;

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

+                    needEndFaces = true;

+                else if (twistTotal != 0.0f)

+                    needEndFaces = true;

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

+                    needEndFaces = true;

+            }

+            else needEndFaces = true;

+

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

+            {

+                PathNode node = path.pathNodes[nodeIndex];

+                Profile newLayer = profile.Copy();

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

+

+                newLayer.AddRot(node.rotation);

+                newLayer.AddPos(node.position);

+

+                if (needEndFaces && nodeIndex == 0)

+                {

+                    newLayer.FlipNormals();

+

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

+                    if (this.viewerMode)

+                    {

+                        Coord faceNormal = newLayer.faceNormal;

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

+                        int numFaces = newLayer.faces.Count;

+                        List<Face> faces = newLayer.faces;

+

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

+                        {

+                            Face face = faces[i];

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

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

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

+

+                            newViewerFace.coordIndex1 = face.v1;

+                            newViewerFace.coordIndex2 = face.v2;

+                            newViewerFace.coordIndex3 = face.v3;

+

+                            newViewerFace.n1 = faceNormal;

+                            newViewerFace.n2 = faceNormal;

+                            newViewerFace.n3 = faceNormal;

+

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

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

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

+

+                            this.viewerFaces.Add(newViewerFace);

+                        }

+                    }

+                } // if (nodeIndex == 0)

+

+                // append this layer

+

+                int coordsLen = this.coords.Count;

+                newLayer.AddValue2FaceVertexIndices(coordsLen);

+

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

+

+                if (this.calcVertexNormals)

+                {

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

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

+                }

+

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

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

+

+                // fill faces between layers

+

+                int numVerts = newLayer.coords.Count;

+                Face newFace = new Face();

+

+                if (nodeIndex > 0)

+                {

+                    int startVert = coordsLen + 1;

+                    int endVert = this.coords.Count;

+

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

+                        startVert--;

+

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

+                    {

+                        int iNext = i + 1;

+                        if (i == endVert - 1)

+                            iNext = startVert;

+

+                        int whichVert = i - startVert;

+

+                        newFace.v1 = i;

+                        newFace.v2 = i - numVerts;

+                        newFace.v3 = iNext - numVerts;

+                        this.faces.Add(newFace);

+

+                        newFace.v2 = iNext - numVerts;

+                        newFace.v3 = iNext;

+                        this.faces.Add(newFace);

+

+                        if (this.viewerMode)

+                        {

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

+

+                            int primFaceNum = profile.faceNumbers[whichVert];

+                            if (!needEndFaces)

+                                primFaceNum -= 1;

+

+                            ViewerFace newViewerFace1 = new ViewerFace(primFaceNum);

+                            ViewerFace newViewerFace2 = new ViewerFace(primFaceNum);

+

+                            float u1 = newLayer.us[whichVert];

+                            float u2 = 1.0f;

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

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

+

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

+                            {

+                                u1 = 0.0f;

+                                u2 = 1.0f;

+                            }

+                            else if (sides < 5)

+                            {

+                                if (whichVert < profile.numOuterVerts)

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

+                                    // to reflect the entire texture width

+                                    u1 *= sides;

+                                    u2 *= sides;

+                                    u2 -= (int)u1;

+                                    u1 -= (int)u1;

+                                    if (u2 < 0.1f)

+                                        u2 = 1.0f;

+                                }

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

+                                {

+                                    u1 *= 2.0f;

+                                    u2 *= 2.0f;

+                                }

+                            }

+

+                            newViewerFace1.uv1.U = u1;

+                            newViewerFace1.uv2.U = u1;

+                            newViewerFace1.uv3.U = u2;

+

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

+                            newViewerFace1.uv2.V = lastV;

+                            newViewerFace1.uv3.V = lastV;

+

+                            newViewerFace2.uv1.U = u1;

+                            newViewerFace2.uv2.U = u2;

+                            newViewerFace2.uv3.U = u2;

+

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

+                            newViewerFace2.uv2.V = lastV;

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

+

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

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

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

+

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

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

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

+

+                            newViewerFace1.coordIndex1 = i;

+                            newViewerFace1.coordIndex2 = i - numVerts;

+                            newViewerFace1.coordIndex3 = iNext - numVerts;

+

+                            newViewerFace2.coordIndex1 = i;

+                            newViewerFace2.coordIndex2 = iNext - numVerts;

+                            newViewerFace2.coordIndex3 = iNext;

+

+                            // profile cut faces

+                            if (whichVert == cut1Vert)

+                            {

+                                newViewerFace1.n1 = newLayer.cutNormal1;

+                                newViewerFace1.n2 = newViewerFace1.n3 = lastCutNormal1;

+

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

+                                newViewerFace2.n2 = lastCutNormal1;

+                            }

+                            else if (whichVert == cut2Vert)

+                            {

+                                newViewerFace1.n1 = newLayer.cutNormal2;

+                                newViewerFace1.n2 = newViewerFace1.n3 = lastCutNormal2;

+

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

+                                newViewerFace2.n2 = lastCutNormal2;

+                            }

+

+                            else // outer and hollow faces

+                            {

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

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

+                                    newViewerFace1.CalcSurfaceNormal();

+                                    newViewerFace2.CalcSurfaceNormal();

+                                }

+                                else

+                                {

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

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

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

+

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

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

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

+                                }

+                            }

+

+                            this.viewerFaces.Add(newViewerFace1);

+                            this.viewerFaces.Add(newViewerFace2);

+

+                        }

+                    }

+                }

+

+                lastCutNormal1 = newLayer.cutNormal1;

+                lastCutNormal2 = newLayer.cutNormal2;

+                lastV = 1.0f - node.percentOfPath;

+

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

+                {

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

+                    Coord faceNormal = newLayer.faceNormal;

+                    ViewerFace newViewerFace = new ViewerFace();

+                    newViewerFace.primFaceNumber = 0;

+                    int numFaces = newLayer.faces.Count;

+                    List<Face> faces = newLayer.faces;

+

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

+                    {

+                        Face face = faces[i];

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

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

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

+

+                        newViewerFace.coordIndex1 = face.v1 - coordsLen;

+                        newViewerFace.coordIndex2 = face.v2 - coordsLen;

+                        newViewerFace.coordIndex3 = face.v3 - coordsLen;

+

+                        newViewerFace.n1 = faceNormal;

+                        newViewerFace.n2 = faceNormal;

+                        newViewerFace.n3 = faceNormal;

+

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

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

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

+

+                        this.viewerFaces.Add(newViewerFace);

+                    }

+                }

+

+

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

+

+        }

+

+

+        /// <summary>

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

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

+        /// </summary>

+        /// 

+        public void ExtrudeLinear()

+        {

+            this.Extrude(PathType.Linear);

+        }

+

+

+        /// <summary>

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

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

+        /// </summary>

+        /// 

+        public void ExtrudeCircular()

+        {

+            this.Extrude(PathType.Circular);

+        }

+

+

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

+        {

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

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

+

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

+

+            normal.Normalize();

+

+            return normal;

+        }

+

+        private Coord SurfaceNormal(Face face)

+        {

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

+        }

+

+        /// <summary>

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

+        /// </summary>

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

+        /// <returns></returns>

+        public Coord SurfaceNormal(int faceIndex)

+        {

+            int numFaces = this.faces.Count;

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

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

+

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

+        }

+

+        /// <summary>

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

+        /// </summary>

+        /// <returns></returns>

+        public PrimMesh Copy()

+        {

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

+            copy.twistBegin = this.twistBegin;

+            copy.twistEnd = this.twistEnd;

+            copy.topShearX = this.topShearX;

+            copy.topShearY = this.topShearY;

+            copy.pathCutBegin = this.pathCutBegin;

+            copy.pathCutEnd = this.pathCutEnd;

+            copy.dimpleBegin = this.dimpleBegin;

+            copy.dimpleEnd = this.dimpleEnd;

+            copy.skew = this.skew;

+            copy.holeSizeX = this.holeSizeX;

+            copy.holeSizeY = this.holeSizeY;

+            copy.taperX = this.taperX;

+            copy.taperY = this.taperY;

+            copy.radius = this.radius;

+            copy.revolutions = this.revolutions;

+            copy.stepsPerRevolution = this.stepsPerRevolution;

+            copy.calcVertexNormals = this.calcVertexNormals;

+            copy.normalsProcessed = this.normalsProcessed;

+            copy.viewerMode = this.viewerMode;

+            copy.numPrimFaces = this.numPrimFaces;

+            copy.errorMessage = this.errorMessage;

+

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

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

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

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

+

+            return copy;

+        }

+

+        /// <summary>

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

+        /// </summary>

+        public void CalcNormals()

+        {

+            if (normalsProcessed)

+                return;

+

+            normalsProcessed = true;

+

+            int numFaces = faces.Count;

+

+            if (!this.calcVertexNormals)

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

+

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

+            {

+                Face face = faces[i];

+

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

+

+                int normIndex = normals.Count - 1;

+                face.n1 = normIndex;

+                face.n2 = normIndex;

+                face.n3 = normIndex;

+

+                this.faces[i] = face;

+            }

+        }

+

+        /// <summary>

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

+        /// </summary>

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

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

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

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

+        {

+            int i;

+            int numVerts = this.coords.Count;

+            Coord vert;

+

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

+            {

+                vert = this.coords[i];

+                vert.X += x;

+                vert.Y += y;

+                vert.Z += z;

+                this.coords[i] = vert;

+            }

+

+            if (this.viewerFaces != null)

+            {

+                int numViewerFaces = this.viewerFaces.Count;

+

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

+                {

+                    ViewerFace v = this.viewerFaces[i];

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

+                    this.viewerFaces[i] = v;

+                }

+            }

+        }

+

+        /// <summary>

+        /// Rotates the mesh

+        /// </summary>

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

+        public void AddRot(Quat q)

+        {

+            int i;

+            int numVerts = this.coords.Count;

+

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

+                this.coords[i] *= q;

+

+            if (this.normals != null)

+            {

+                int numNormals = this.normals.Count;

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

+                    this.normals[i] *= q;

+            }

+

+            if (this.viewerFaces != null)

+            {

+                int numViewerFaces = this.viewerFaces.Count;

+

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

+                {

+                    ViewerFace v = this.viewerFaces[i];

+                    v.v1 *= q;

+                    v.v2 *= q;

+                    v.v3 *= q;

+

+                    v.n1 *= q;

+                    v.n2 *= q;

+                    v.n3 *= q;

+                    this.viewerFaces[i] = v;

+                }

+            }

+        }

+

+#if VERTEX_INDEXER

+        public VertexIndexer GetVertexIndexer()

+        {

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

+                return new VertexIndexer(this);

+            return null;

+        }

+#endif

+

+        /// <summary>

+        /// Scales the mesh

+        /// </summary>

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

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

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

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

+        {

+            int i;

+            int numVerts = this.coords.Count;

+            //Coord vert;

+

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

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

+                this.coords[i] *= m;

+

+            if (this.viewerFaces != null)

+            {

+                int numViewerFaces = this.viewerFaces.Count;

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

+                {

+                    ViewerFace v = this.viewerFaces[i];

+                    v.v1 *= m;

+                    v.v2 *= m;

+                    v.v3 *= m;

+                    this.viewerFaces[i] = v;

+                }

+

+            }

+

+        }

+

+        /// <summary>

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

+        /// </summary>

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

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

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

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

+        {

+            if (path == null)

+                return;

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

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

+            StreamWriter sw = new StreamWriter(completePath);

+

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

+            {

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

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

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

+

+                sw.WriteLine(s);

+            }

+

+            sw.Close();

+        }

+    }

+}

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

+ * Copyright (c) Contributors

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

+ *

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

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

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

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

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

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

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

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ */

+

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

+#define SYSTEM_DRAWING

+

+using System;

+using System.Collections.Generic;

+using System.Text;

+using System.IO;

+

+#if SYSTEM_DRAWING

+using System.Drawing;

+using System.Drawing.Imaging;

+#endif

+

+namespace PrimMesher

+{

+

+    public class SculptMesh

+    {

+        public List<Coord> coords;

+        public List<Face> faces;

+

+        public List<ViewerFace> viewerFaces;

+        public List<Coord> normals;

+        public List<UVCoord> uvs;

+

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

+

+#if SYSTEM_DRAWING

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

+        {

+            int sourceWidth = srcImage.Width;

+            int sourceHeight = srcImage.Height;

+            int sourceX = 0;

+            int sourceY = 0;

+

+            int destX = 0;

+            int destY = 0;

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

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

+

+            Bitmap scaledImage;

+

+            if (removeAlpha)

+            {

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

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

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

+                        {

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

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

+                        }

+

+                scaledImage = new Bitmap(destWidth, destHeight,

+                                         PixelFormat.Format24bppRgb);

+            }

+            else

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

+

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

+

+            Graphics grPhoto = Graphics.FromImage(scaledImage);

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

+

+            grPhoto.DrawImage(srcImage,

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

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

+                GraphicsUnit.Pixel);

+

+            grPhoto.Dispose();

+            return scaledImage;

+        }

+

+

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

+        {

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

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

+            bitmap.Dispose();

+            return sculptMesh;

+        }

+

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

+        {

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

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

+            bitmap.Dispose();

+        }

+#endif

+

+        /// <summary>

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

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

+        /// </summary>

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

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

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

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

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

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

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

+        {

+            float xStep, yStep;

+            float uStep, vStep;

+

+            int numYElements = zMap.GetLength(0);

+            int numXElements = zMap.GetLength(1);

+

+            try

+            {

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

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

+

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

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

+            }

+            catch (DivideByZeroException)

+            {

+                return;

+            }

+

+            coords = new List<Coord>();

+            faces = new List<Face>();

+            normals = new List<Coord>();

+            uvs = new List<UVCoord>();

+

+            viewerFaces = new List<ViewerFace>();

+

+            int p1, p2, p3, p4;

+

+            int x, y;

+            int xStart = 0, yStart = 0;

+

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

+            {

+                int rowOffset = y * numXElements;

+

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

+                {

+                    /*

+                    *   p1-----p2

+                    *   | \ f2 |

+                    *   |   \  |

+                    *   | f1  \|

+                    *   p3-----p4

+                    */

+

+                    p4 = rowOffset + x;

+                    p3 = p4 - 1;

+

+                    p2 = p4 - numXElements;

+                    p1 = p3 - numXElements;

+

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

+                    this.coords.Add(c);

+                    if (viewerMode)

+                    {

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

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

+                    }

+

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

+                    {

+                        Face f1, f2;

+

+                        if (viewerMode)

+                        {

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

+                            f1.uv1 = p1;

+                            f1.uv2 = p4;

+                            f1.uv3 = p3;

+

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

+                            f2.uv1 = p1;

+                            f2.uv2 = p2;

+                            f2.uv3 = p4;

+                        }

+                        else

+                        {

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

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

+                        }

+

+                        this.faces.Add(f1);

+                        this.faces.Add(f2);

+                    }

+                }

+            }

+

+            if (viewerMode)

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

+        }

+

+#if SYSTEM_DRAWING

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

+        {

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

+        }

+

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

+        {

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

+        }

+#endif

+

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

+        {

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

+        }

+

+#if SYSTEM_DRAWING

+        /// <summary>

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

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

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

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

+        /// </summary>

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

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

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

+        /// <returns></returns>

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

+        {

+            int numRows = bitmap.Height / scale;

+            int numCols = bitmap.Width / scale;

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

+

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

+            pixScale /= 255;

+

+            int imageX, imageY = 0;

+

+            int rowNdx, colNdx;

+

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

+            {

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

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

+                {

+                    imageX = colNdx * scale;

+                    int imageYStart = rowNdx * scale;

+                    int imageYEnd = imageYStart + scale;

+                    int imageXEnd = imageX + scale;

+                    float rSum = 0.0f;

+                    float gSum = 0.0f;

+                    float bSum = 0.0f;

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

+                    {

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

+                        {

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

+                            if (c.A != 255)

+                            {

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

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

+                            }

+                            rSum += c.R;

+                            gSum += c.G;

+                            bSum += c.B;

+                        }

+                    }

+                    if (mirror)

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

+                    else

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

+

+                }

+                rows.Add(row);

+            }

+            return rows;

+        }

+

+

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

+        {

+            coords = new List<Coord>();

+            faces = new List<Face>();

+            normals = new List<Coord>();

+            uvs = new List<UVCoord>();

+

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

+

+            if (mirror)

+                if (sculptType == SculptType.plane)

+                    invert = !invert;

+

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

+

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

+

+            float fScale = 1.0f / sourceScaleFactor;

+

+            int iScale = (int)fScale;

+            if (iScale < 1) iScale = 1;

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

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

+            else

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

+        }

+#endif

+

+

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

+        {

+            coords = new List<Coord>();

+            faces = new List<Face>();

+            normals = new List<Coord>();

+            uvs = new List<UVCoord>();

+

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

+

+            if (mirror)

+                if (sculptType == SculptType.plane)

+                    invert = !invert;

+

+            viewerFaces = new List<ViewerFace>();

+

+            int width = rows[0].Count;

+

+            int p1, p2, p3, p4;

+

+            int imageX, imageY;

+

+            if (sculptType != SculptType.plane)

+            {

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

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

+            }

+

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

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

+

+            if (sculptType == SculptType.sphere)

+            {

+                int count = rows[0].Count;

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

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

+

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

+                {

+                    topPoleRow.Add(topPole);

+                    bottomPoleRow.Add(bottomPole);

+                }

+                rows.Insert(0, topPoleRow);

+                rows.Add(bottomPoleRow);

+            }

+            else if (sculptType == SculptType.torus)

+                rows.Add(rows[0]);

+

+            int coordsDown = rows.Count;

+            int coordsAcross = rows[0].Count;

+

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

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

+

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

+            {

+                int rowOffset = imageY * coordsAcross;

+

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

+                {

+                    /*

+                    *   p1-----p2

+                    *   | \ f2 |

+                    *   |   \  |

+                    *   | f1  \|

+                    *   p3-----p4

+                    */

+

+                    p4 = rowOffset + imageX;

+                    p3 = p4 - 1;

+

+                    p2 = p4 - coordsAcross;

+                    p1 = p3 - coordsAcross;

+

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

+                    if (viewerMode)

+                    {

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

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

+                    }

+

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

+                    {

+                        Face f1, f2;

+

+                        if (viewerMode)

+                        {

+                            if (invert)

+                            {

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

+                                f1.uv1 = p1;

+                                f1.uv2 = p4;

+                                f1.uv3 = p3;

+

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

+                                f2.uv1 = p1;

+                                f2.uv2 = p2;

+                                f2.uv3 = p4;

+                            }

+                            else

+                            {

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

+                                f1.uv1 = p1;

+                                f1.uv2 = p3;

+                                f1.uv3 = p4;

+

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

+                                f2.uv1 = p1;

+                                f2.uv2 = p4;

+                                f2.uv3 = p2;

+                            }

+                        }

+                        else

+                        {

+                            if (invert)

+                            {

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

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

+                            }

+                            else

+                            {

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

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

+                            }

+                        }

+

+                        this.faces.Add(f1);

+                        this.faces.Add(f2);

+                    }

+                }

+            }

+

+            if (viewerMode)

+                calcVertexNormals(sculptType, coordsAcross, coordsDown);

+        }

+

+        /// <summary>

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

+        /// </summary>

+        /// <returns></returns>

+        public SculptMesh Copy()

+        {

+            return new SculptMesh(this);

+        }

+

+        public SculptMesh(SculptMesh sm)

+        {

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

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

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

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

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

+        }

+

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

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

+            // each vertex and then normalizing

+            int numFaces = this.faces.Count;

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

+            {

+                Face face = this.faces[i];

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

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

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

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

+            }

+

+            int numNormals = this.normals.Count;

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

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

+

+            if (sculptType != SculptType.plane)

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

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

+                {

+                    int rowOffset = y * xSize;

+

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

+                }

+            }

+

+            foreach (Face face in this.faces)

+            {

+                ViewerFace vf = new ViewerFace(0);

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

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

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

+

+                vf.coordIndex1 = face.v1;

+                vf.coordIndex2 = face.v2;

+                vf.coordIndex3 = face.v3;

+

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

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

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

+

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

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

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

+

+                this.viewerFaces.Add(vf);

+            }

+        }

+

+        /// <summary>

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

+        /// </summary>

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

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

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

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

+        {

+            int i;

+            int numVerts = this.coords.Count;

+            Coord vert;

+

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

+            {

+                vert = this.coords[i];

+                vert.X += x;

+                vert.Y += y;

+                vert.Z += z;

+                this.coords[i] = vert;

+            }

+

+            if (this.viewerFaces != null)

+            {

+                int numViewerFaces = this.viewerFaces.Count;

+

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

+                {

+                    ViewerFace v = this.viewerFaces[i];

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

+                    this.viewerFaces[i] = v;

+                }

+            }

+        }

+

+        /// <summary>

+        /// Rotates the mesh

+        /// </summary>

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

+        public void AddRot(Quat q)

+        {

+            int i;

+            int numVerts = this.coords.Count;

+

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

+                this.coords[i] *= q;

+

+            int numNormals = this.normals.Count;

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

+                this.normals[i] *= q;

+

+            if (this.viewerFaces != null)

+            {

+                int numViewerFaces = this.viewerFaces.Count;

+

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

+                {

+                    ViewerFace v = this.viewerFaces[i];

+                    v.v1 *= q;

+                    v.v2 *= q;

+                    v.v3 *= q;

+

+                    v.n1 *= q;

+                    v.n2 *= q;

+                    v.n3 *= q;

+

+                    this.viewerFaces[i] = v;

+                }

+            }

+        }

+

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

+        {

+            int i;

+            int numVerts = this.coords.Count;

+

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

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

+                this.coords[i] *= m;

+

+            if (this.viewerFaces != null)

+            {

+                int numViewerFaces = this.viewerFaces.Count;

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

+                {

+                    ViewerFace v = this.viewerFaces[i];

+                    v.v1 *= m;

+                    v.v2 *= m;

+                    v.v3 *= m;

+                    this.viewerFaces[i] = v;

+                }

+            }

+        }

+

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

+        {

+            if (path == null)

+                return;

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

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

+            StreamWriter sw = new StreamWriter(completePath);

+

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

+            {

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

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

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

+

+                sw.WriteLine(s);

+            }

+

+            sw.Close();

+        }

+    }

+}

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 2ab00a3..be7c348 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1575,11 +1575,11 @@ Console.WriteLine(" JointCreateFixed");
                 {
 //Console.WriteLine("Move " +  m_primName);
                     if (!d.BodyIsEnabled (Body))  d.BodyEnable (Body); // KF add 161009
-                    /*
                     // NON-'VEHICLES' are dealt with here
                     if (d.BodyIsEnabled(Body) && !m_angularlock.ApproxEquals(Vector3.Zero, 0.003f))
                     {
                         d.Vector3 avel2 = d.BodyGetAngularVel(Body);
+                        /*
                         if (m_angularlock.X == 1)
                             avel2.X = 0;
                         if (m_angularlock.Y == 1)
@@ -1587,8 +1587,8 @@ Console.WriteLine(" JointCreateFixed");
                         if (m_angularlock.Z == 1)
                             avel2.Z = 0;
                         d.BodySetAngularVel(Body, avel2.X, avel2.Y, avel2.Z);
+                         */
                     }
-                    */
                     //float PID_P = 900.0f;
 
                     float m_mass = CalculateMass();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 62eae76..8f82304 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4221,7 +4221,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return;
             }
 
-            if( message == string.Empty)
+            if (message == string.Empty)
             {
                 ShoutError("Trying to use llTextBox with empty message.");
             }