46 files changed, 1956 insertions, 1232 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 6255515..9c7598a 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -35,6 +35,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Timers;
 using log4net;
+using NDesk.Options;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -310,8 +311,11 @@ namespace OpenSim
                                          "Change the scale of a named prim", HandleEditScale);
            m_console.Commands.AddCommand("Users", false, "kick user",
-                                          "kick user <first> <last> [message]",
+                                          "kick user <first> <last> [--force] [message]",
-                                          "Kick a user off the simulator", KickUserCommand);
+                                          "Kick a user off the simulator",
+                                          "The --force option will kick the user without any checks to see whether it's already in the process of closing\n"
+                                          + "Only use this option if you are sure the avatar is inactive and a normal kick user operation does not removed them",
+                                          KickUserCommand);
            m_console.Commands.AddCommand("Users", false, "show users",
                                          "show users [full]",
@@ -416,6 +420,7 @@ namespace OpenSim
            {
                RunCommandScript(m_shutdownCommandsFile);
            }
+            
            base.ShutdownSpecific();
        }
@@ -453,11 +458,17 @@ namespace OpenSim
        /// <param name="cmdparams">name of avatar to kick</param>
        private void KickUserCommand(string module, string[] cmdparams)
        {
-            if (cmdparams.Length < 4)
+            bool force = false;
+            
+            OptionSet options = new OptionSet().Add("f|force", delegate (string v) { force = v != null; });
+            List<string> mainParams = options.Parse(cmdparams);
+            if (mainParams.Count < 4)
                return;
            string alert = null;
-            if (cmdparams.Length > 4)
+            if (mainParams.Count > 4)
                alert = String.Format("\n{0}\n", String.Join(" ", cmdparams, 4, cmdparams.Length - 4));
            IList agents = SceneManager.GetCurrentSceneAvatars();
@@ -466,8 +477,8 @@ namespace OpenSim
            {
                RegionInfo regionInfo = presence.Scene.RegionInfo;
-                if (presence.Firstname.ToLower().Contains(cmdparams[2].ToLower()) &&
+                if (presence.Firstname.ToLower().Contains(mainParams[2].ToLower()) &&
-                    presence.Lastname.ToLower().Contains(cmdparams[3].ToLower()))
+                    presence.Lastname.ToLower().Contains(mainParams[3].ToLower()))
                {
                    MainConsole.Instance.Output(
                        String.Format(
@@ -480,7 +491,7 @@ namespace OpenSim
                    else
                        presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
-                    presence.Scene.IncomingCloseAgent(presence.UUID);
+                    presence.Scene.IncomingCloseAgent(presence.UUID, force);
                }
            }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index cd70410..d604cf6 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
            UUID spId = TestHelpers.ParseTail(0x1);
            SceneHelpers.AddScenePresence(m_scene, spId);
-            m_scene.IncomingCloseAgent(spId);
+            m_scene.IncomingCloseAgent(spId, false);
            // TODO: Add more assertions for the other aspects of event queues
            Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(0));
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index ddd8f18..2dcc9cb 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -509,19 +509,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// </summary>
        public void Close()
        {
-            Close(true);
+            Close(true, false);
        }
-        /// <summary>
+        public void Close(bool sendStop, bool force)
-        /// Shut down the client view
-        /// </summary>
-        public void Close(bool sendStop)
        {
            // We lock here to prevent race conditions between two threads calling close simultaneously (e.g.
            // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection.
            lock (CloseSyncLock)
            {
-                if (!IsActive)
+                // We still perform a force close inside the sync lock since this is intended to attempt close where
+                // there is some unidentified connection problem, not where we have issues due to deadlock
+                if (!IsActive && !force)
                    return;
                IsActive = false;
@@ -12140,7 +12139,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        {
            Kick(reason);
            Thread.Sleep(1000);
-            Close();
+            Disconnect();
        }
        public void Disconnect()
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index d6513c5..60ab70e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1523,7 +1523,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if (!client.IsLoggingOut)
            {
                client.IsLoggingOut = true;
-                client.Close(false);
+                client.Close(false, false);
            }
        }
    }
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index d9a619d..48f3a23 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -461,7 +461,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
            SceneObjectGroup rezzedAtt = presence.GetAttachments()[0];
-            scene.IncomingCloseAgent(presence.UUID);
+            scene.IncomingCloseAgent(presence.UUID, false);
            // Check that we can't retrieve this attachment from the scene.
            Assert.That(scene.GetSceneObjectGroup(rezzedAtt.UUID), Is.Null);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index b112b6d..12a05b3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -350,38 +350,38 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
            Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaLL1.PrincipalID));            
        }
        
-        /// <summary>
+//        /// <summary>
-        /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
+//        /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
-        /// an account exists with the same name as the creator, though not the same id.
+//        /// an account exists with the same name as the creator, though not the same id.
-        /// </summary>
+//        /// </summary>
-        [Test]
+//        [Test]
-        public void TestLoadIarV0_1SameNameCreator()
+//        public void TestLoadIarV0_1SameNameCreator()
-        {
+//        {
-            TestHelpers.InMethod();
+//            TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
+//            TestHelpers.EnableLogging();
+//
-            UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "meowfood");
+//            UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "meowfood");
-            UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL2, "hampshire");
+//            UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL2, "hampshire");
-            
+//            
-            m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);            
+//            m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);            
-            InventoryItemBase foundItem1
+//            InventoryItemBase foundItem1
-                = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
+//                = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
+//
-            Assert.That(
+//            Assert.That(
-                foundItem1.CreatorId, Is.EqualTo(m_uaLL2.PrincipalID.ToString()), 
+//                foundItem1.CreatorId, Is.EqualTo(m_uaLL2.PrincipalID.ToString()), 
-                "Loaded item non-uuid creator doesn't match original");            
+//                "Loaded item non-uuid creator doesn't match original");            
-            Assert.That(
+//            Assert.That(
-                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL2.PrincipalID), 
+//                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL2.PrincipalID), 
-                "Loaded item uuid creator doesn't match original");
+//                "Loaded item uuid creator doesn't match original");
-            Assert.That(foundItem1.Owner, Is.EqualTo(m_uaMT.PrincipalID),
+//            Assert.That(foundItem1.Owner, Is.EqualTo(m_uaMT.PrincipalID),
-                "Loaded item owner doesn't match inventory reciever");
+//                "Loaded item owner doesn't match inventory reciever");
-            
+//            
-            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());            
+//            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());            
-            string xmlData = Utils.BytesToString(asset1.Data);
+//            string xmlData = Utils.BytesToString(asset1.Data);
-            SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+//            SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
-            
+//            
-            Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaLL2.PrincipalID));
+//            Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaLL2.PrincipalID));
-        }
+//        }
        /// <summary>
        /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 9ffb851..538dd5f 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -644,7 +644,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                // an agent cannot teleport back to this region if it has teleported away.
                Thread.Sleep(2000);
-                sp.Scene.IncomingCloseAgent(sp.UUID);
+                sp.Scene.IncomingCloseAgent(sp.UUID, false);
            }
            else
            {
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 18bd018..13b7498 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -49,6 +49,11 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
        public const int DISP_EXPIRE = 1;
        public const int DISP_TEMP   = 2;
+        /// <summary>
+        /// If true then where possible dynamic textures are reused.
+        /// </summary>
+        public bool ReuseTextures { get; set; }
        private Dictionary<UUID, Scene> RegisteredScenes = new Dictionary<UUID, Scene>();
        private Dictionary<string, IDynamicTextureRender> RenderPlugins =
@@ -56,6 +61,15 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
        private Dictionary<UUID, DynamicTextureUpdater> Updaters = new Dictionary<UUID, DynamicTextureUpdater>();
+        /// <summary>
+        /// Record dynamic textures that we can reuse for a given data and parameter combination rather than
+        /// regenerate.
+        /// </summary>
+        /// <remarks>
+        /// Key is string.Format("{0}{1}", data
+        /// </remarks>
+        private Cache m_reuseableDynamicTextures;
        #region IDynamicTextureManager Members
        public void RegisterRender(string handleType, IDynamicTextureRender render)
@@ -71,7 +85,8 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
        /// </summary>
        /// <param name="id"></param>
        /// <param name="data"></param>
-        public void ReturnData(UUID id, byte[] data)
+        /// <param name="isReuseable">True if the data generated can be reused for subsequent identical requests</param>
+        public void ReturnData(UUID id, byte[] data, bool isReuseable)
        {
            DynamicTextureUpdater updater = null;
@@ -88,7 +103,11 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                if (RegisteredScenes.ContainsKey(updater.SimUUID))
                {
                    Scene scene = RegisteredScenes[updater.SimUUID];
-                    updater.DataReceived(data, scene);
+                    UUID newTextureID = updater.DataReceived(data, scene);
+                    if (ReuseTextures && isReuseable && !updater.BlendWithOldTexture)
+                        m_reuseableDynamicTextures.Store(
+                            GenerateReusableTextureKey(updater.BodyData, updater.Params), newTextureID);
                }
            }
@@ -169,6 +188,11 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
        {
            if (RenderPlugins.ContainsKey(contentType))
            {
+                // If we want to reuse dynamic textures then we have to ignore any request from the caller to expire
+                // them.
+                if (ReuseTextures)
+                    disp = disp & ~DISP_EXPIRE;
                DynamicTextureUpdater updater = new DynamicTextureUpdater();
                updater.SimUUID = simID;
                updater.PrimID = primID;
@@ -183,21 +207,49 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                updater.Url = "Local image";
                updater.Disp = disp;
-                lock (Updaters)
+                object reusableTextureUUID = null;
+                if (ReuseTextures)
+                    reusableTextureUUID
+                        = m_reuseableDynamicTextures.Get(GenerateReusableTextureKey(data, extraParams));
+                // We cannot reuse a dynamic texture if the data is going to be blended with something already there.
+                if (reusableTextureUUID == null || updater.BlendWithOldTexture)
                {
-                    if (!Updaters.ContainsKey(updater.UpdaterID))
+                    lock (Updaters)
                    {
-                        Updaters.Add(updater.UpdaterID, updater);
+                        if (!Updaters.ContainsKey(updater.UpdaterID))
+                        {
+                            Updaters.Add(updater.UpdaterID, updater);
+                        }
+                    }
+                    RenderPlugins[contentType].AsyncConvertData(updater.UpdaterID, data, extraParams);
+                }
+                else
+                {
+                    // No need to add to updaters as the texture is always the same.  Not that this functionality
+                    // apppears to be implemented anyway.
+                    if (RegisteredScenes.ContainsKey(updater.SimUUID))
+                    {
+                        SceneObjectPart part = RegisteredScenes[updater.SimUUID].GetSceneObjectPart(updater.PrimID);
+                        if (part != null)
+                            updater.UpdatePart(part, (UUID)reusableTextureUUID);
                    }
                }
-                RenderPlugins[contentType].AsyncConvertData(updater.UpdaterID, data, extraParams);
                return updater.UpdaterID;
            }
            
            return UUID.Zero;
        }
+        private string GenerateReusableTextureKey(string data, string extraParams)
+        {
+            return string.Format("{0}{1}", data, extraParams);
+        }
        public void GetDrawStringSize(string contentType, string text, string fontName, int fontSize,
                                      out double xSize, out double ySize)
        {
@@ -224,6 +276,12 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
        public void PostInitialise()
        {
+//            ReuseTextures = true;
+            if (ReuseTextures)
+            {
+                m_reuseableDynamicTextures = new Cache(CacheMedium.Memory, CacheStrategy.Conservative);
+                m_reuseableDynamicTextures.DefaultTTL = new TimeSpan(24, 0, 0);
+            }
        }
        public void Close()
@@ -269,9 +327,60 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
            }
            /// <summary>
+            /// Update the given part with the new texture.
+            /// </summary>
+            /// <returns>
+            /// The old texture UUID.
+            /// </returns>
+            public UUID UpdatePart(SceneObjectPart part, UUID textureID)
+            {
+                UUID oldID;
+                lock (part)
+                {
+                    // mostly keep the values from before
+                    Primitive.TextureEntry tmptex = part.Shape.Textures;
+                    // FIXME: Need to return the appropriate ID if only a single face is replaced.
+                    oldID = tmptex.DefaultTexture.TextureID;
+                    if (Face == ALL_SIDES)
+                    {
+                        oldID = tmptex.DefaultTexture.TextureID;
+                        tmptex.DefaultTexture.TextureID = textureID;
+                    }
+                    else
+                    {
+                        try
+                        {
+                            Primitive.TextureEntryFace texface = tmptex.CreateFace((uint)Face);
+                            texface.TextureID = textureID;
+                            tmptex.FaceTextures[Face] = texface;
+                        }
+                        catch (Exception)
+                        {
+                            tmptex.DefaultTexture.TextureID = textureID;
+                        }
+                    }
+                    // I'm pretty sure we always want to force this to true
+                    // I'm pretty sure noone whats to set fullbright true if it wasn't true before.
+                    // tmptex.DefaultTexture.Fullbright = true;
+                    part.UpdateTextureEntry(tmptex.GetBytes());
+                }
+                return oldID;
+            }
+            /// <summary>
            /// Called once new texture data has been received for this updater.
            /// </summary>
-            public void DataReceived(byte[] data, Scene scene)
+            /// <param name="data"></param>
+            /// <param name="scene"></param>
+            /// <param name="isReuseable">True if the data given is reuseable.</param>
+            /// <returns>The asset UUID given to the incoming data.</returns>
+            public UUID DataReceived(byte[] data, Scene scene)
            {
                SceneObjectPart part = scene.GetSceneObjectPart(PrimID);
@@ -281,7 +390,8 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                        String.Format("DynamicTextureModule: Error preparing image using URL {0}", Url);
                    scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say,
                                  0, part.ParentGroup.RootPart.AbsolutePosition, part.Name, part.UUID, false);
-                    return;
+                    
+                    return UUID.Zero;
                }
                byte[] assetData = null;
@@ -323,52 +433,23 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                    cacheLayerDecode = null;
                }
-                UUID oldID = UUID.Zero;
+                UUID oldID = UpdatePart(part, asset.FullID);
-                lock (part)
-                {
-                    // mostly keep the values from before
-                    Primitive.TextureEntry tmptex = part.Shape.Textures;
-                    // remove the old asset from the cache
-                    oldID = tmptex.DefaultTexture.TextureID;
-                    
-                    if (Face == ALL_SIDES)
-                    {
-                        tmptex.DefaultTexture.TextureID = asset.FullID;
-                    }
-                    else
-                    {
-                        try
-                        {
-                            Primitive.TextureEntryFace texface = tmptex.CreateFace((uint)Face);
-                            texface.TextureID = asset.FullID;
-                            tmptex.FaceTextures[Face] = texface;
-                        }
-                        catch (Exception)
-                        {
-                            tmptex.DefaultTexture.TextureID = asset.FullID;
-                        }
-                    }
-                    // I'm pretty sure we always want to force this to true
-                    // I'm pretty sure noone whats to set fullbright true if it wasn't true before.
-                    // tmptex.DefaultTexture.Fullbright = true;
-                    part.UpdateTextureEntry(tmptex.GetBytes());
-                }
                if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0))
                {
-                    if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString());
+                    if (oldAsset == null)
+                        oldAsset = scene.AssetService.Get(oldID.ToString());
                    if (oldAsset != null)
                    {
-                        if (oldAsset.Temporary == true)
+                        if (oldAsset.Temporary)
                        {
                            scene.AssetService.Delete(oldID.ToString());
                        }
                    }
                }
+                return asset.FullID;
            }
            private byte[] BlendTextures(byte[] frontImage, byte[] backImage, bool setNewAlpha, byte newAlpha)
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 6f83948..2b3a0f2 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -67,12 +67,18 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
            return true;
        }
+//        public bool AlwaysIdenticalConversion(string bodyData, string extraParams)
+//        {
+//            // We don't support conversion of body data.
+//            return false;
+//        }
        public byte[] ConvertUrl(string url, string extraParams)
        {
            return null;
        }
-        public byte[] ConvertStream(Stream data, string extraParams)
+        public byte[] ConvertData(string bodyData, string extraParams)
        {
            return null;
        }
@@ -236,9 +242,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
                    stream.Close();
                }
            }
            m_log.DebugFormat("[LOADIMAGEURLMODULE] Returning {0} bytes of image data for request {1}",
                                       imageJ2000.Length, state.RequestID);
-            m_textureManager.ReturnData(state.RequestID, imageJ2000);
+            m_textureManager.ReturnData(state.RequestID, imageJ2000, false);
        }
        #region Nested type: RequestState
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
index 9787c8c..b50c0bd 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
@@ -45,31 +45,250 @@ using OpenSim.Tests.Common.Mock;
 namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
 {
    [TestFixture]
-    public class VectorRenderModuleTests
+    public class VectorRenderModuleTests : OpenSimTestCase
    {
+        Scene m_scene;
+        DynamicTextureModule m_dtm;
+        VectorRenderModule m_vrm;
+        private void SetupScene(bool reuseTextures)
+        {
+            m_scene = new SceneHelpers().SetupScene();
+            m_dtm = new DynamicTextureModule();
+            m_dtm.ReuseTextures = reuseTextures;
+            m_vrm = new VectorRenderModule();
+            SceneHelpers.SetupSceneModules(m_scene, m_dtm, m_vrm);
+        }
        [Test]
        public void TestDraw()
        {
            TestHelpers.InMethod();
-            Scene scene = new SceneHelpers().SetupScene();
+            SetupScene(false);
-            DynamicTextureModule dtm = new DynamicTextureModule();
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
-            VectorRenderModule vrm = new VectorRenderModule();
-            SceneHelpers.SetupSceneModules(scene, dtm, vrm);
-            SceneObjectGroup so = SceneHelpers.AddSceneObject(scene);
            UUID originalTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
-            dtm.AddDynamicTextureData(
+            m_dtm.AddDynamicTextureData(
-                scene.RegionInfo.RegionID,
+                m_scene.RegionInfo.RegionID,
                so.UUID,
-                vrm.GetContentType(),
+                m_vrm.GetContentType(),
                "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World;",
                "",
                0);
+            Assert.That(originalTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
+        }
+        [Test]
+        public void TestRepeatSameDraw()
+        {
+            TestHelpers.InMethod();
+            string dtText = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World;";
+            SetupScene(false);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
+        }
+        [Test]
+        public void TestRepeatSameDrawDifferentExtraParams()
+        {
+            TestHelpers.InMethod();
+            string dtText = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World;";
+            SetupScene(false);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "alpha:250",
+                0);
+            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
+        }
+        [Test]
+        public void TestRepeatSameDrawContainingImage()
+        {
+            TestHelpers.InMethod();
+            string dtText
+                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://localhost/shouldnotexist.png";
+            SetupScene(false);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
+        }
+        [Test]
+        public void TestDrawReusingTexture()
+        {
+            TestHelpers.InMethod();
+            SetupScene(true);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+            UUID originalTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World;",
+                "",
+                0);
            Assert.That(originalTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
        }
+        [Test]
+        public void TestRepeatSameDrawReusingTexture()
+        {
+            TestHelpers.InMethod();
+            string dtText = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World;";
+            SetupScene(true);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+            Assert.That(firstDynamicTextureID, Is.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
+        }
+        [Test]
+        public void TestRepeatSameDrawDifferentExtraParamsReusingTexture()
+        {
+            TestHelpers.InMethod();
+            string dtText = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World;";
+            SetupScene(true);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "alpha:250",
+                0);
+            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
+        }
+        [Test]
+        public void TestRepeatSameDrawContainingImageReusingTexture()
+        {
+            TestHelpers.InMethod();
+            string dtText
+                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://localhost/shouldnotexist.png";
+            SetupScene(true);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
+        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index 8b2f2f8..f687646 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -30,6 +30,7 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Net;
 using Nini.Config;
 using OpenMetaverse;
@@ -47,7 +48,6 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private string m_name = "VectorRenderModule";
        private Scene m_scene;
        private IDynamicTextureManager m_textureManager;
        private Graphics m_graph;
@@ -61,12 +61,12 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
        public string GetContentType()
        {
-            return ("vector");
+            return "vector";
        }
        public string GetName()
        {
-            return m_name;
+            return Name;
        }
        public bool SupportsAsynchronous()
@@ -74,14 +74,26 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
            return true;
        }
+//        public bool AlwaysIdenticalConversion(string bodyData, string extraParams)
+//        {
+//            string[] lines = GetLines(bodyData);
+//            return lines.Any((str, r) => str.StartsWith("Image"));
+//        }
        public byte[] ConvertUrl(string url, string extraParams)
        {
            return null;
        }
-        public byte[] ConvertStream(Stream data, string extraParams)
+        public byte[] ConvertData(string bodyData, string extraParams)
        {
-            return null;
+            bool reuseable;
+            return Draw(bodyData, extraParams, out reuseable);
+        }
+        private byte[] ConvertData(string bodyData, string extraParams, out bool reuseable)
+        {
+            return Draw(bodyData, extraParams, out reuseable);
        }
        public bool AsyncConvertUrl(UUID id, string url, string extraParams)
@@ -91,7 +103,12 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
        public bool AsyncConvertData(UUID id, string bodyData, string extraParams)
        {
-            Draw(bodyData, id, extraParams);
+            // XXX: This isn't actually being done asynchronously!
+            bool reuseable;
+            byte[] data = ConvertData(bodyData, extraParams, out reuseable);
+            m_textureManager.ReturnData(id, data, reuseable);
            return true;
        }
@@ -152,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
        public string Name
        {
-            get { return m_name; }
+            get { return "VectorRenderModule"; }
        }
        public bool IsSharedModule
@@ -162,7 +179,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
        #endregion
-        private void Draw(string data, UUID id, string extraParams)
+        private byte[] Draw(string data, string extraParams, out bool reuseable)
        {
            // We need to cater for old scripts that didnt use extraParams neatly, they use either an integer size which represents both width and height, or setalpha
            // we will now support multiple comma seperated params in the form  width:256,height:512,alpha:255
@@ -308,36 +325,44 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
            try
            {
-                if (alpha == 256)
+                // XXX: In testing, it appears that if multiple threads dispose of separate GDI+ objects simultaneously,
-                    bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb);
+                // the native malloc heap can become corrupted, possibly due to a double free().  This may be due to
-                else
+                // bugs in the underlying libcairo used by mono's libgdiplus.dll on Linux/OSX.  These problems were
-                    bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+                // seen with both libcario 1.10.2-6.1ubuntu3 and 1.8.10-2ubuntu1.  They go away if disposal is perfomed
+                // under lock.
-                graph = Graphics.FromImage(bitmap);
+                lock (this)
-    
-                // this is really just to save people filling the 
-                // background color in their scripts, only do when fully opaque
-                if (alpha >= 255)
                {
-                    using (SolidBrush bgFillBrush = new SolidBrush(bgColor))
+                    if (alpha == 256)
+                        bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb);
+                    else
+                        bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+    
+                    graph = Graphics.FromImage(bitmap);
+        
+                    // this is really just to save people filling the 
+                    // background color in their scripts, only do when fully opaque
+                    if (alpha >= 255)
                    {
-                        graph.FillRectangle(bgFillBrush, 0, 0, width, height);
+                        using (SolidBrush bgFillBrush = new SolidBrush(bgColor))
+                        {
+                            graph.FillRectangle(bgFillBrush, 0, 0, width, height);
+                        }
                    }
-                }
+        
-    
+                    for (int w = 0; w < bitmap.Width; w++)
-                for (int w = 0; w < bitmap.Width; w++)
-                {
-                    if (alpha <= 255) 
                    {
-                        for (int h = 0; h < bitmap.Height; h++)
+                        if (alpha <= 255) 
                        {
-                            bitmap.SetPixel(w, h, Color.FromArgb(alpha, bitmap.GetPixel(w, h)));
+                            for (int h = 0; h < bitmap.Height; h++)
+                            {
+                                bitmap.SetPixel(w, h, Color.FromArgb(alpha, bitmap.GetPixel(w, h)));
+                            }
                        }
                    }
+        
+                    GDIDraw(data, graph, altDataDelim, out reuseable);
                }
    
-                GDIDraw(data, graph, altDataDelim);
-    
                byte[] imageJ2000 = new byte[0];
    
                try
@@ -351,15 +376,23 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                        e.Message, e.StackTrace);
                }
-                m_textureManager.ReturnData(id, imageJ2000);
+                return imageJ2000;
            }
            finally
            {
-                if (graph != null)
+                // XXX: In testing, it appears that if multiple threads dispose of separate GDI+ objects simultaneously,
-                    graph.Dispose();
+                // the native malloc heap can become corrupted, possibly due to a double free().  This may be due to
+                // bugs in the underlying libcairo used by mono's libgdiplus.dll on Linux/OSX.  These problems were
-                if (bitmap != null)
+                // seen with both libcario 1.10.2-6.1ubuntu3 and 1.8.10-2ubuntu1.  They go away if disposal is perfomed
-                    bitmap.Dispose();
+                // under lock.
+                lock (this)
+                {
+                    if (graph != null)
+                        graph.Dispose();
+    
+                    if (bitmap != null)
+                        bitmap.Dispose();
+                }
            }
        }
        
@@ -418,8 +451,21 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
        }
 */
-        private void GDIDraw(string data, Graphics graph, char dataDelim)
+        /// <summary>
+        /// Split input data into discrete command lines.
+        /// </summary>
+        /// <returns></returns>
+        /// <param name='data'></param>
+        /// <param name='dataDelim'></param>
+        private string[] GetLines(string data, char dataDelim)
+        {
+            char[] lineDelimiter = { dataDelim };
+            return data.Split(lineDelimiter);
+        }
+        private void GDIDraw(string data, Graphics graph, char dataDelim, out bool reuseable)
        {
+            reuseable = true;
            Point startPoint = new Point(0, 0);
            Point endPoint = new Point(0, 0);
            Pen drawPen = null;
@@ -434,11 +480,9 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                myFont = new Font(fontName, fontSize);
                myBrush = new SolidBrush(Color.Black);
-                char[] lineDelimiter = {dataDelim};
                char[] partsDelimiter = {','};
-                string[] lines = data.Split(lineDelimiter);
-                foreach (string line in lines)
+                foreach (string line in GetLines(data, dataDelim))
                {
                    string nextLine = line.Trim();
                    //replace with switch, or even better, do some proper parsing
@@ -469,6 +513,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                    }
                    else if (nextLine.StartsWith("Image"))
                    {
+                        // We cannot reuse any generated texture involving fetching an image via HTTP since that image
+                        // can change.
+                        reuseable = false;
                        float x = 0;
                        float y = 0;
                        GetParams(partsDelimiter, ref nextLine, 5, ref x, ref y);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 6eb99ea..8ed1833 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -313,7 +313,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
            if (m_scenes.ContainsKey(destination.RegionID))
            {
-                Util.FireAndForget(delegate { m_scenes[destination.RegionID].IncomingCloseAgent(id); });
+//                    m_log.DebugFormat(
+//                        "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
+//                        s.RegionInfo.RegionName, destination.RegionHandle);
+                Util.FireAndForget(delegate { m_scenes[destination.RegionID].IncomingCloseAgent(id, false); });
                return true;
            }
            //m_log.Debug("[LOCAL COMMS]: region not found in SendCloseAgent");
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 619550c..142567b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -97,6 +97,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            }
        }
+        /// <summary>
+        /// Used to cache lookups for valid groups.
+        /// </summary>
+        private IDictionary<UUID, bool> m_validGroupUuids = new Dictionary<UUID, bool>();
+        private IGroupsModule m_groupsModule;
        public ArchiveReadRequest(Scene scene, string loadPath, bool merge, bool skipAssets, Guid requestId)
        {
            m_scene = scene;
@@ -120,6 +127,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            // Zero can never be a valid user id
            m_validUserUuids[UUID.Zero] = false;
+            m_groupsModule = m_scene.RequestModuleInterface<IGroupsModule>();
        }
        public ArchiveReadRequest(Scene scene, Stream loadStream, bool merge, bool skipAssets, Guid requestId)
@@ -132,6 +141,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            // Zero can never be a valid user id
            m_validUserUuids[UUID.Zero] = false;
+            m_groupsModule = m_scene.RequestModuleInterface<IGroupsModule>();
        }
        /// <summary>
@@ -302,6 +313,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                    if (!ResolveUserUuid(part.LastOwnerID))
                        part.LastOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                    if (!ResolveGroupUuid(part.GroupID))
+                        part.GroupID = UUID.Zero;
                    // And zap any troublesome sit target information
 //                    part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
 //                    part.SitTargetPosition    = new Vector3(0, 0, 0);
@@ -335,13 +349,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                            {
                                kvp.Value.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
                            }
                            if (kvp.Value.CreatorData == null || kvp.Value.CreatorData == string.Empty)
                            {
                                if (!ResolveUserUuid(kvp.Value.CreatorID))
                                    kvp.Value.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
                            }
                            if (UserManager != null)
                                UserManager.AddUser(kvp.Value.CreatorID, kvp.Value.CreatorData);
+                            if (!ResolveGroupUuid(kvp.Value.GroupID))
+                                kvp.Value.GroupID = UUID.Zero;
                        }
                        part.TaskInventory.LockItemsForRead(false);
                    }
@@ -382,9 +401,27 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            foreach (string serialisedParcel in serialisedParcels)
            {
                LandData parcel = LandDataSerializer.Deserialize(serialisedParcel);
+                
+                // Validate User and Group UUID's
                if (!ResolveUserUuid(parcel.OwnerID))
                    parcel.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
-                
+                if (!ResolveGroupUuid(parcel.GroupID))
+                {
+                    parcel.GroupID = UUID.Zero;
+                    parcel.IsGroupOwned = false;
+                }
+                List<LandAccessEntry> accessList = new List<LandAccessEntry>();
+                foreach (LandAccessEntry entry in parcel.ParcelAccessList)
+                {
+                    if (ResolveUserUuid(entry.AgentID))
+                        accessList.Add(entry);
+                    // else, drop this access rule
+                }
+                parcel.ParcelAccessList = accessList;
 //                m_log.DebugFormat(
 //                    "[ARCHIVER]: Adding parcel {0}, local id {1}, area {2}", 
 //                    parcel.Name, parcel.LocalID, parcel.Area);
@@ -419,6 +456,30 @@ namespace OpenSim.Region.CoreModules.World.Archiver
        }
        /// <summary>
+        /// Look up the given group id to check whether it's one that is valid for this grid.
+        /// </summary>
+        /// <param name="uuid"></param>
+        /// <returns></returns>
+        private bool ResolveGroupUuid(UUID uuid)
+        {
+            if (uuid == UUID.Zero)
+                return true;    // this means the object has no group
+            if (!m_validGroupUuids.ContainsKey(uuid))
+            {
+                bool exists;
+                
+                if (m_groupsModule == null)
+                    exists = false;
+                else
+                    exists = (m_groupsModule.GetGroupRecord(uuid) != null);
+                m_validGroupUuids.Add(uuid, exists);
+            }
+            return m_validGroupUuids[uuid];
+        }
        /// Load an asset
        /// </summary>
        /// <param name="assetFilename"></param>
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index 14c1a39..a2f0950 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -85,13 +85,15 @@ namespace OpenSim.Region.CoreModules.World.Sound
                        dis = 0;
                }
+                float thisSpGain;
                // Scale by distance
                if (radius == 0)
-                    gain = (float)((double)gain * ((100.0 - dis) / 100.0));
+                    thisSpGain = (float)((double)gain * ((100.0 - dis) / 100.0));
                else
-                    gain = (float)((double)gain * ((radius - dis) / radius));
+                    thisSpGain = (float)((double)gain * ((radius - dis) / radius));
-                sp.ControllingClient.SendPlayAttachedSound(soundID, objectID, ownerID, (float)gain, flags);
+                sp.ControllingClient.SendPlayAttachedSound(soundID, objectID, ownerID, thisSpGain, flags);
            });
        }
        
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 402b9fb..d99567c 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -414,6 +414,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
        private void LoadPlugins()
        {
            m_plugineffects = new Dictionary<string, ITerrainEffect>();
+            LoadPlugins(Assembly.GetCallingAssembly());
            string plugineffectsPath = "Terrain";
            
            // Load the files in the Terrain/ dir
@@ -427,34 +428,39 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                try
                {
                    Assembly library = Assembly.LoadFrom(file);
-                    foreach (Type pluginType in library.GetTypes())
+                    LoadPlugins(library);
-                    {
+                }
-                        try
+                catch (BadImageFormatException)
-                        {
+                {
-                            if (pluginType.IsAbstract || pluginType.IsNotPublic)
+                }
-                                continue;
+            }
+        }
-                            string typeName = pluginType.Name;
+        private void LoadPlugins(Assembly library)
+        {
+            foreach (Type pluginType in library.GetTypes())
+            {
+                try
+                {
+                    if (pluginType.IsAbstract || pluginType.IsNotPublic)
+                        continue;
-                            if (pluginType.GetInterface("ITerrainEffect", false) != null)
+                    string typeName = pluginType.Name;
-                            {
-                                ITerrainEffect terEffect = (ITerrainEffect) Activator.CreateInstance(library.GetType(pluginType.ToString()));
-                                InstallPlugin(typeName, terEffect);
+                    if (pluginType.GetInterface("ITerrainEffect", false) != null)
-                            }
+                    {
-                            else if (pluginType.GetInterface("ITerrainLoader", false) != null)
+                        ITerrainEffect terEffect = (ITerrainEffect)Activator.CreateInstance(library.GetType(pluginType.ToString()));
-                            {
-                                ITerrainLoader terLoader = (ITerrainLoader) Activator.CreateInstance(library.GetType(pluginType.ToString()));
+                        InstallPlugin(typeName, terEffect);
-                                m_loaders[terLoader.FileExtension] = terLoader;
+                    }
-                                m_log.Info("L ... " + typeName);
+                    else if (pluginType.GetInterface("ITerrainLoader", false) != null)
-                            }
+                    {
-                        }
+                        ITerrainLoader terLoader = (ITerrainLoader)Activator.CreateInstance(library.GetType(pluginType.ToString()));
-                        catch (AmbiguousMatchException)
+                        m_loaders[terLoader.FileExtension] = terLoader;
-                        {
+                        m_log.Info("L ... " + typeName);
-                        }
                    }
                }
-                catch (BadImageFormatException)
+                catch (AmbiguousMatchException)
                {
                }
            }
@@ -1178,7 +1184,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
        private void InterfaceRunPluginEffect(Object[] args)
        {
-            if ((string) args[0] == "list")
+            string firstArg = (string)args[0];
+            if (firstArg == "list")
            {
                m_log.Info("List of loaded plugins");
                foreach (KeyValuePair<string, ITerrainEffect> kvp in m_plugineffects)
@@ -1187,14 +1194,14 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                }
                return;
            }
-            if ((string) args[0] == "reload")
+            if (firstArg == "reload")
            {
                LoadPlugins();
                return;
            }
-            if (m_plugineffects.ContainsKey((string) args[0]))
+            if (m_plugineffects.ContainsKey(firstArg))
            {
-                m_plugineffects[(string) args[0]].RunEffect(m_channel);
+                m_plugineffects[firstArg].RunEffect(m_channel);
                CheckForTerrainUpdates();
            }
            else
diff --git a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs
index 8954513..1a3bcbb 100644
--- a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Region.Framework.Interfaces
    public interface IDynamicTextureManager
    {
        void RegisterRender(string handleType, IDynamicTextureRender render);
-        void ReturnData(UUID id, byte[] data);
+        void ReturnData(UUID id, byte[] data, bool isReuseable);
        UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams,
                                    int updateTimer);
@@ -113,8 +113,20 @@ namespace OpenSim.Region.Framework.Interfaces
        string GetName();
        string GetContentType();
        bool SupportsAsynchronous();
+//        /// <summary>
+//        /// Return true if converting the input body and extra params data will always result in the same byte[] array
+//        /// </summary>
+//        /// <remarks>
+//        /// This method allows the caller to use a previously generated asset if it has one.
+//        /// </remarks>
+//        /// <returns></returns>
+//        /// <param name='bodyData'></param>
+//        /// <param name='extraParams'></param>
+//        bool AlwaysIdenticalConversion(string bodyData, string extraParams);
        byte[] ConvertUrl(string url, string extraParams);
-        byte[] ConvertStream(Stream data, string extraParams);
+        byte[] ConvertData(string bodyData, string extraParams);
        bool AsyncConvertUrl(UUID id, string url, string extraParams);
        bool AsyncConvertData(UUID id, string bodyData, string extraParams);
        void GetDrawStringSize(string text, string fontName, int fontSize, 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 1309623..863aa49 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        public void StartScripts()
        {
-            m_log.InfoFormat("[SCENE]: Starting scripts in {0}, please wait.", RegionInfo.RegionName);
+//            m_log.InfoFormat("[SCENE]: Starting scripts in {0}, please wait.", RegionInfo.RegionName);
            IScriptModule[] engines = RequestModuleInterfaces<IScriptModule>();
@@ -1986,6 +1986,9 @@ namespace OpenSim.Region.Framework.Scenes
                // If child prims have invalid perms, fix them
                grp.AdjustChildPrimPermissions();
+                // If child prims have invalid perms, fix them
+                grp.AdjustChildPrimPermissions();
                if (remoteClient == null)
                {
                    // Autoreturn has a null client. Nothing else does. So
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index e970543..16c0d25 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -543,7 +543,7 @@ namespace OpenSim.Region.Framework.Scenes
            if (!InventoryService.AddFolder(folder))
            {
                m_log.WarnFormat(
-                     "[AGENT INVENTORY]: Failed to move create folder for user {0} {1}",
+                     "[AGENT INVENTORY]: Failed to create folder for user {0} {1}",
                     remoteClient.Name, remoteClient.AgentId);
            }
        }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0237021..8fb6c3b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -103,8 +103,26 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        public bool CollidablePrims { get; private set; }
+        /// <summary>
+        /// Minimum value of the size of a non-physical prim in each axis
+        /// </summary>
+        public float m_minNonphys = 0.01f;
+        /// <summary>
+        /// Maximum value of the size of a non-physical prim in each axis
+        /// </summary>
        public float m_maxNonphys = 256;
+        /// <summary>
+        /// Minimum value of the size of a physical prim in each axis
+        /// </summary>
+        public float m_minPhys = 0.01f;
+        /// <summary>
+        /// Maximum value of the size of a physical prim in each axis
+        /// </summary>
        public float m_maxPhys = 10;
        public bool m_clampPrimSize;
        public bool m_trustBinaries;
        public bool m_allowScriptCrossings;
@@ -746,12 +764,24 @@ namespace OpenSim.Region.Framework.Scenes
                    PhysicalPrims = startupConfig.GetBoolean("physical_prim", true);
                    CollidablePrims = startupConfig.GetBoolean("collidable_prim", true);
+                    m_minNonphys = startupConfig.GetFloat("NonphysicalPrimMin", m_minNonphys);
+                    if (RegionInfo.NonphysPrimMin > 0)
+                    {
+                        m_minNonphys = RegionInfo.NonphysPrimMin;
+                    }
                    m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys);
                    if (RegionInfo.NonphysPrimMax > 0)
                    {
                        m_maxNonphys = RegionInfo.NonphysPrimMax;
                    }
+                    m_minPhys = startupConfig.GetFloat("PhysicalPrimMin", m_minPhys);
+                    if (RegionInfo.PhysPrimMin > 0)
+                    {
+                        m_minPhys = RegionInfo.PhysPrimMin;
+                    }
                    m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", m_maxPhys);
                    if (RegionInfo.PhysPrimMax > 0)
@@ -3713,7 +3743,7 @@ namespace OpenSim.Region.Framework.Scenes
                    "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting.  Removing existing presence.",
                    sp.Name, sp.UUID, RegionInfo.RegionName);
-                sp.ControllingClient.Close();
+                sp.ControllingClient.Close(true, true);
                sp = null;
            }
@@ -4316,15 +4346,18 @@ namespace OpenSim.Region.Framework.Scenes
        /// Tell a single agent to disconnect from the region.
        /// </summary>
        /// <param name="agentID"></param>
-        /// <param name="childOnly"></param>
+        /// <param name="force">
-        public bool IncomingCloseAgent(UUID agentID, bool childOnly)
+        /// Force the agent to close even if it might be in the middle of some other operation.  You do not want to
+        /// force unless you are absolutely sure that the agent is dead and a normal close is not working.
+        /// </param>
+        public bool IncomingCloseAgent(UUID agentID, bool force)
        {
            //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID);
            ScenePresence presence = m_sceneGraph.GetScenePresence(agentID);
            if (presence != null)
            {
-                presence.ControllingClient.Close();
+                presence.ControllingClient.Close(true, force);
                return true;
            }
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index e29b2c1..c4b7b27 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -342,7 +342,7 @@ namespace OpenSim.Region.Framework.Scenes
        public bool AddNewSceneObject(
            SceneObjectGroup sceneObject, bool attachToBackup, Vector3? pos, Quaternion? rot, Vector3 vel)
        {
-            AddNewSceneObject(sceneObject, true, false);
+            AddNewSceneObject(sceneObject, attachToBackup, false);
            if (pos != null)
                sceneObject.AbsolutePosition = (Vector3)pos;
@@ -421,12 +421,9 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    Vector3 scale = part.Shape.Scale;
-                    if (scale.X > m_parentScene.m_maxNonphys)
+                    scale.X = Math.Max(m_parentScene.m_minNonphys, Math.Min(m_parentScene.m_maxNonphys, scale.X));
-                        scale.X = m_parentScene.m_maxNonphys;
+                    scale.Y = Math.Max(m_parentScene.m_minNonphys, Math.Min(m_parentScene.m_maxNonphys, scale.Y));
-                    if (scale.Y > m_parentScene.m_maxNonphys)
+                    scale.Z = Math.Max(m_parentScene.m_minNonphys, Math.Min(m_parentScene.m_maxNonphys, scale.Z));
-                        scale.Y = m_parentScene.m_maxNonphys;
-                    if (scale.Z > m_parentScene.m_maxNonphys)
-                        scale.Z = m_parentScene.m_maxNonphys;
                    part.Shape.Scale = scale;
                }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index df4bd0d..0448c25 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3460,17 +3460,17 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="scale"></param>
        public void GroupResize(Vector3 scale)
        {
-            scale.X = Math.Min(scale.X, Scene.m_maxNonphys);
+            scale.X = Math.Max(Scene.m_minNonphys, Math.Min(Scene.m_maxNonphys, scale.X));
-            scale.Y = Math.Min(scale.Y, Scene.m_maxNonphys);
+            scale.Y = Math.Max(Scene.m_minNonphys, Math.Min(Scene.m_maxNonphys, scale.Y));
-            scale.Z = Math.Min(scale.Z, Scene.m_maxNonphys);
+            scale.Z = Math.Max(Scene.m_minNonphys, Math.Min(Scene.m_maxNonphys, scale.Z));
            PhysicsActor pa = m_rootPart.PhysActor;
            if (pa != null && pa.IsPhysical)
            {
-                scale.X = Math.Min(scale.X, Scene.m_maxPhys);
+                scale.X = Math.Max(Scene.m_minPhys, Math.Min(Scene.m_maxPhys, scale.X));
-                scale.Y = Math.Min(scale.Y, Scene.m_maxPhys);
+                scale.Y = Math.Max(Scene.m_minPhys, Math.Min(Scene.m_maxPhys, scale.Y));
-                scale.Z = Math.Min(scale.Z, Scene.m_maxPhys);
+                scale.Z = Math.Max(Scene.m_minPhys, Math.Min(Scene.m_maxPhys, scale.Z));
            }
            float x = (scale.X / RootPart.Scale.X);
@@ -3501,6 +3501,14 @@ namespace OpenSim.Region.Framework.Scenes
                                y *= a;
                                z *= a;
                            }
+                            else if (oldSize.X * x < m_scene.m_minPhys)
+                            {
+                                f = m_scene.m_minPhys / oldSize.X;
+                                a = f / x;
+                                x *= a;
+                                y *= a;
+                                z *= a;
+                            }
                            if (oldSize.Y * y > m_scene.m_maxPhys)
                            {
@@ -3510,6 +3518,14 @@ namespace OpenSim.Region.Framework.Scenes
                                y *= a;
                                z *= a;
                            }
+                            else if (oldSize.Y * y < m_scene.m_minPhys)
+                            {
+                                f = m_scene.m_minPhys / oldSize.Y;
+                                a = f / y;
+                                x *= a;
+                                y *= a;
+                                z *= a;
+                            }
                            if (oldSize.Z * z > m_scene.m_maxPhys)
                            {
@@ -3519,6 +3535,14 @@ namespace OpenSim.Region.Framework.Scenes
                                y *= a;
                                z *= a;
                            }
+                            else if (oldSize.Z * z < m_scene.m_minPhys)
+                            {
+                                f = m_scene.m_minPhys / oldSize.Z;
+                                a = f / z;
+                                x *= a;
+                                y *= a;
+                                z *= a;
+                            }
                        }
                        else
                        {
@@ -3530,6 +3554,14 @@ namespace OpenSim.Region.Framework.Scenes
                                y *= a;
                                z *= a;
                            }
+                            else if (oldSize.X * x < m_scene.m_minNonphys)
+                            {
+                                f = m_scene.m_minNonphys / oldSize.X;
+                                a = f / x;
+                                x *= a;
+                                y *= a;
+                                z *= a;
+                            }
                            if (oldSize.Y * y > m_scene.m_maxNonphys)
                            {
@@ -3539,6 +3571,14 @@ namespace OpenSim.Region.Framework.Scenes
                                y *= a;
                                z *= a;
                            }
+                            else if (oldSize.Y * y < m_scene.m_minNonphys)
+                            {
+                                f = m_scene.m_minNonphys / oldSize.Y;
+                                a = f / y;
+                                x *= a;
+                                y *= a;
+                                z *= a;
+                            }
                            if (oldSize.Z * z > m_scene.m_maxNonphys)
                            {
@@ -3548,6 +3588,14 @@ namespace OpenSim.Region.Framework.Scenes
                                y *= a;
                                z *= a;
                            }
+                            else if (oldSize.Z * z < m_scene.m_minNonphys)
+                            {
+                                f = m_scene.m_minNonphys / oldSize.Z;
+                                a = f / z;
+                                x *= a;
+                                y *= a;
+                                z *= a;
+                            }
                        }
                    }
                }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 4788a24..8e419f9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -790,7 +790,7 @@ namespace OpenSim.Region.Framework.Scenes
                    }
                    catch (Exception e)
                    {
-                        m_log.Error("[SCENEOBJECTPART]: GROUP POSITION. " + e.Message);
+                        m_log.ErrorFormat("[SCENEOBJECTPART]: GROUP POSITION. {0}", e);
                    }
                }
            }
@@ -2972,17 +2972,16 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="scale"></param>
        public void Resize(Vector3 scale)
        {
-            scale.X = Math.Min(scale.X, ParentGroup.Scene.m_maxNonphys);
+            scale.X = Math.Max(ParentGroup.Scene.m_minNonphys, Math.Min(ParentGroup.Scene.m_maxNonphys, scale.X));
-            scale.Y = Math.Min(scale.Y, ParentGroup.Scene.m_maxNonphys);
+            scale.Y = Math.Max(ParentGroup.Scene.m_minNonphys, Math.Min(ParentGroup.Scene.m_maxNonphys, scale.Y));
-            scale.Z = Math.Min(scale.Z, ParentGroup.Scene.m_maxNonphys);
+            scale.Z = Math.Max(ParentGroup.Scene.m_minNonphys, Math.Min(ParentGroup.Scene.m_maxNonphys, scale.Z));
            PhysicsActor pa = PhysActor;
            if (pa != null && pa.IsPhysical)
            {
-                scale.X = Math.Min(scale.X, ParentGroup.Scene.m_maxPhys);
+                scale.X = Math.Max(ParentGroup.Scene.m_minPhys, Math.Min(ParentGroup.Scene.m_maxPhys, scale.X));
-                scale.Y = Math.Min(scale.Y, ParentGroup.Scene.m_maxPhys);
+                scale.Y = Math.Max(ParentGroup.Scene.m_minPhys, Math.Min(ParentGroup.Scene.m_maxPhys, scale.Y));
-                scale.Z = Math.Min(scale.Z, ParentGroup.Scene.m_maxPhys);
+                scale.Z = Math.Max(ParentGroup.Scene.m_minPhys, Math.Min(ParentGroup.Scene.m_maxPhys, scale.Z));
            }
 //            m_log.DebugFormat("[SCENE OBJECT PART]: Resizing {0} {1} to {2}", Name, LocalId, scale);
@@ -3567,23 +3566,32 @@ namespace OpenSim.Region.Framework.Scenes
        }
        /// <summary>
-        /// Set the color of prim faces
+        /// Set the color & alpha of prim faces
        /// </summary>
-        /// <param name="color"></param>
        /// <param name="face"></param>
-        public void SetFaceColor(Vector3 color, int face)
+        /// <param name="color"></param>
+        /// <param name="alpha"></param>
+        public void SetFaceColorAlpha(int face, Vector3 color, double ?alpha)
        {
+            Vector3 clippedColor = Util.Clip(color, 0.0f, 1.0f);
+            float clippedAlpha = alpha.HasValue ?
+                Util.Clip((float)alpha.Value, 0.0f, 1.0f) : 0;
            // The only way to get a deep copy/ If we don't do this, we can
-            // mever detect color changes further down.
+            // never detect color changes further down.
            Byte[] buf = Shape.Textures.GetBytes();
            Primitive.TextureEntry tex = new Primitive.TextureEntry(buf, 0, buf.Length);
            Color4 texcolor;
            if (face >= 0 && face < GetNumberOfSides())
            {
                texcolor = tex.CreateFace((uint)face).RGBA;
-                texcolor.R = Util.Clip((float)color.X, 0.0f, 1.0f);
+                texcolor.R = clippedColor.X;
-                texcolor.G = Util.Clip((float)color.Y, 0.0f, 1.0f);
+                texcolor.G = clippedColor.Y;
-                texcolor.B = Util.Clip((float)color.Z, 0.0f, 1.0f);
+                texcolor.B = clippedColor.Z;
+                if (alpha.HasValue)
+                {
+                    texcolor.A = clippedAlpha;
+                }
                tex.FaceTextures[face].RGBA = texcolor;
                UpdateTextureEntry(tex.GetBytes());
                return;
@@ -3595,15 +3603,23 @@ namespace OpenSim.Region.Framework.Scenes
                    if (tex.FaceTextures[i] != null)
                    {
                        texcolor = tex.FaceTextures[i].RGBA;
-                        texcolor.R = Util.Clip((float)color.X, 0.0f, 1.0f);
+                        texcolor.R = clippedColor.X;
-                        texcolor.G = Util.Clip((float)color.Y, 0.0f, 1.0f);
+                        texcolor.G = clippedColor.Y;
-                        texcolor.B = Util.Clip((float)color.Z, 0.0f, 1.0f);
+                        texcolor.B = clippedColor.Z;
+                        if (alpha.HasValue)
+                        {
+                            texcolor.A = clippedAlpha;
+                        }
                        tex.FaceTextures[i].RGBA = texcolor;
                    }
                    texcolor = tex.DefaultTexture.RGBA;
-                    texcolor.R = Util.Clip((float)color.X, 0.0f, 1.0f);
+                    texcolor.R = clippedColor.X;
-                    texcolor.G = Util.Clip((float)color.Y, 0.0f, 1.0f);
+                    texcolor.G = clippedColor.Y;
-                    texcolor.B = Util.Clip((float)color.Z, 0.0f, 1.0f);
+                    texcolor.B = clippedColor.Z;
+                    if (alpha.HasValue)
+                    {
+                        texcolor.A = clippedAlpha;
+                    }
                    tex.DefaultTexture.RGBA = texcolor;
                }
                UpdateTextureEntry(tex.GetBytes());
@@ -4891,6 +4907,57 @@ namespace OpenSim.Region.Framework.Scenes
            ScheduleFullUpdate();
        }
+        public void UpdateSlice(float begin, float end)
+        {
+            if (end < begin)
+            {
+                float temp = begin;
+                begin = end;
+                end = temp;
+            }
+            end = Math.Min(1f, Math.Max(0f, end));
+            begin = Math.Min(Math.Min(1f, Math.Max(0f, begin)), end - 0.02f);
+            if (begin < 0.02f && end < 0.02f)
+            {
+                begin = 0f;
+                end = 0.02f;
+            }
+            ushort uBegin = (ushort)(50000.0 * begin);
+            ushort uEnd = (ushort)(50000.0 * (1f - end));
+            bool updatePossiblyNeeded = false;
+            PrimType primType = GetPrimType();
+            if (primType == PrimType.SPHERE || primType == PrimType.TORUS || primType == PrimType.TUBE || primType == PrimType.RING)
+            {
+                if (m_shape.ProfileBegin != uBegin || m_shape.ProfileEnd != uEnd)
+                {
+                    m_shape.ProfileBegin = uBegin;
+                    m_shape.ProfileEnd = uEnd;
+                    updatePossiblyNeeded = true;
+                }
+            }
+            else if (m_shape.PathBegin != uBegin || m_shape.PathEnd != uEnd)
+            {
+                m_shape.PathBegin = uBegin;
+                m_shape.PathEnd = uEnd;
+                updatePossiblyNeeded = true;
+            }
+            if (updatePossiblyNeeded && ParentGroup != null)
+            {
+                ParentGroup.HasGroupChanged = true;
+            }
+            if (updatePossiblyNeeded && PhysActor != null)
+            {
+                PhysActor.Shape = m_shape;
+                ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
+            }
+            if (updatePossiblyNeeded)
+            {
+                ScheduleFullUpdate();
+            }
+        }
        /// <summary>
        /// If the part is a sculpt/mesh, retrieve the mesh data and reinsert it into the shape so that the physics
        /// engine can use it.
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 47b2ead..3e8c7e5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -974,7 +974,9 @@ namespace OpenSim.Region.Framework.Scenes
            {
                if (wasChild && HasAttachments())
                {
-                    m_log.DebugFormat("[SCENE PRESENCE]: Restarting scripts in attachments...");
+                    m_log.DebugFormat(
+                        "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name);
+                    
                    // Resume scripts
                    Util.FireAndForget(delegate(object x) {
                        foreach (SceneObjectGroup sog in m_attachments)
@@ -1527,17 +1529,22 @@ namespace OpenSim.Region.Framework.Scenes
                bool DCFlagKeyPressed = false;
                Vector3 agent_control_v3 = Vector3.Zero;
-                bool oldflying = Flying;
+                bool newFlying = actor.Flying;
                if (ForceFly)
-                    actor.Flying = true;
+                    newFlying = true;
                else if (FlyDisabled)
-                    actor.Flying = false;
+                    newFlying = false;
                else
-                    actor.Flying = ((flags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
+                    newFlying = ((flags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
-                if (actor.Flying != oldflying)
+                if (actor.Flying != newFlying)
+                {
+                    // Note: ScenePresence.Flying is actually fetched from the physical actor
+                    //     so setting PhysActor.Flying here also sets the ScenePresence's value.
+                    actor.Flying = newFlying;
                    update_movementflag = true;
+                }
                if (ParentID == 0)
                {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
index 5758869..5faf131 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
@@ -141,7 +141,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            TestScene scene = new SceneHelpers().SetupScene();
            ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1));
-            scene.IncomingCloseAgent(sp.UUID);
+            scene.IncomingCloseAgent(sp.UUID, false);
            Assert.That(scene.GetScenePresence(sp.UUID), Is.Null);
            Assert.That(scene.AuthenticateHandler.GetAgentCircuitData(sp.UUID), Is.Null);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
index 44d2d45..9457ebb 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
@@ -50,9 +50,41 @@ using OpenSim.Tests.Common.Mock;
 namespace OpenSim.Region.Framework.Tests
 {
    [TestFixture]
-    public class UserInventoryTests
+    public class UserInventoryTests : OpenSimTestCase
    {
        [Test]
+        public void TestCreateInventoryFolders()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+            // For this test both folders will have the same name which is legal in SL user inventories.
+            string foldersName = "f1";
+            Scene scene = new SceneHelpers().SetupScene();
+            UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1001));
+            UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, user1.PrincipalID, foldersName);
+            List<InventoryFolderBase> oneFolder
+                = UserInventoryHelpers.GetInventoryFolders(scene.InventoryService, user1.PrincipalID, foldersName);
+            Assert.That(oneFolder.Count, Is.EqualTo(1));
+            InventoryFolderBase firstRetrievedFolder = oneFolder[0];
+            Assert.That(firstRetrievedFolder.Name, Is.EqualTo(foldersName));
+            UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, user1.PrincipalID, foldersName);
+            List<InventoryFolderBase> twoFolders
+                = UserInventoryHelpers.GetInventoryFolders(scene.InventoryService, user1.PrincipalID, foldersName);
+            Assert.That(twoFolders.Count, Is.EqualTo(2));
+            Assert.That(twoFolders[0].Name, Is.EqualTo(foldersName));
+            Assert.That(twoFolders[1].Name, Is.EqualTo(foldersName));
+            Assert.That(twoFolders[0].ID, Is.Not.EqualTo(twoFolders[1].ID));
+        }
+        [Test]
        public void TestGiveInventoryItem()
        {
            TestHelpers.InMethod();
@@ -83,7 +115,7 @@ namespace OpenSim.Region.Framework.Tests
        public void TestGiveInventoryFolder()
        {
            TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
+//            TestHelpers.EnableLogging();
            
            Scene scene = new SceneHelpers().SetupScene();
            UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1001));
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 3b83e58..1660c45 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -890,10 +890,10 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
        public void Close()
        {
-            Close(true);
+            Close(true, false);
        }
-        public void Close(bool sendStop)
+        public void Close(bool sendStop, bool force)
        {
            Disconnect();
        }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index d00a6c0..625342e 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -905,11 +905,13 @@ namespace OpenSim.Region.OptionalModules.World.NPC
        public void Close()
        {
-            Close(true);
+            Close(true, false);
        }
-        public void Close(bool sendStop)
+        public void Close(bool sendStop, bool force)
        {
+            // Remove ourselves from the scene
+            m_scene.RemoveClient(AgentId, false);
        }
        public void Start()
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index e2f7af9..1b23a36 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -124,10 +124,14 @@ public class BSCharacter : PhysicsActor
        // do actual create at taint time
        _scene.TaintedObject("BSCharacter.create", delegate()
        {
+            DetailLog("{0},BSCharacter.create", _localID);
            BulletSimAPI.CreateObject(parent_scene.WorldID, shapeData);
+            // Set the buoyancy for flying. This will be refactored when all the settings happen in C#
+            BulletSimAPI.SetObjectBuoyancy(_scene.WorldID, LocalID, _buoyancy);
            m_body = new BulletBody(LocalID, BulletSimAPI.GetBodyHandle2(_scene.World.Ptr, LocalID));
-            // avatars get all collisions no matter what
+            // avatars get all collisions no matter what (makes walking on ground and such work)
            BulletSimAPI.AddToCollisionFlags2(Body.Ptr, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
        });
            
@@ -137,7 +141,7 @@ public class BSCharacter : PhysicsActor
    // called when this character is being destroyed and the resources should be released
    public void Destroy()
    {
-        // DetailLog("{0},BSCharacter.Destroy", LocalID);
+        DetailLog("{0},BSCharacter.Destroy", LocalID);
        _scene.TaintedObject("BSCharacter.destroy", delegate()
        {
            BulletSimAPI.DestroyObject(_scene.WorldID, _localID);
@@ -319,14 +323,13 @@ public class BSCharacter : PhysicsActor
    public override bool Flying { 
        get { return _flying; } 
        set {
-            if (_flying != value)
+            _flying = value;
-            {
+            // simulate flying by changing the effect of gravity
-                _flying = value;
+            this.Buoyancy = ComputeBuoyancyFromFlying(_flying);
-                // simulate flying by changing the effect of gravity
-                this.Buoyancy = ComputeBuoyancyFromFlying(_flying);
-            }
        } 
    }
+    // Flying is implimented by changing the avatar's buoyancy.
+    // Would this be done better with a vehicle type?
    private float ComputeBuoyancyFromFlying(bool ifFlying) {
        return ifFlying ? 1f : 0f;
    }
@@ -488,11 +491,9 @@ public class BSCharacter : PhysicsActor
        // Avatars don't report their changes the usual way. Changes are checked for in the heartbeat loop.
        // base.RequestPhysicsterseUpdate();
-        /*
        DetailLog("{0},BSCharacter.UpdateProperties,call,pos={1},orient={2},vel={3},accel={4},rotVel={5}",
                LocalID, entprop.Position, entprop.Rotation, entprop.Velocity, 
                entprop.Acceleration, entprop.RotationalVelocity);
-         */
    }
    // Called by the scene when a collision with this object is reported
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 5a9f135..d7213fc 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -57,6 +57,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
        private int frcount = 0;                                        // Used to limit dynamics debug output to
                                                                        // every 100th frame
+        private BSScene m_physicsScene;
        private BSPrim m_prim;      // the prim this dynamic controller belongs to
        // Vehicle properties
@@ -74,7 +75,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                                                                        // HOVER_UP_ONLY
                                                                        // LIMIT_MOTOR_UP
                                                                        // LIMIT_ROLL_ONLY
-        private VehicleFlag m_Hoverflags = (VehicleFlag)0;
        private Vector3 m_BlockingEndPoint = Vector3.Zero;
        private Quaternion m_RollreferenceFrame = Quaternion.Identity;
        // Linear properties
@@ -124,15 +124,16 @@ namespace OpenSim.Region.Physics.BulletSPlugin
        private float m_verticalAttractionEfficiency = 1.0f;        // damped
        private float m_verticalAttractionTimescale = 500f;         // Timescale > 300  means no vert attractor.
-        public BSDynamics(BSPrim myPrim)
+        public BSDynamics(BSScene myScene, BSPrim myPrim)
        {
+            m_physicsScene = myScene;
            m_prim = myPrim;
            m_type = Vehicle.TYPE_NONE;
        }
        internal void ProcessFloatVehicleParam(Vehicle pParam, float pValue, float timestep)
        {
-            DetailLog("{0},ProcessFloatVehicleParam,param={1},val={2}", m_prim.LocalID, pParam, pValue);
+            VDetailLog("{0},ProcessFloatVehicleParam,param={1},val={2}", m_prim.LocalID, pParam, pValue);
            switch (pParam)
            {
                case Vehicle.ANGULAR_DEFLECTION_EFFICIENCY:
@@ -231,7 +232,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
        internal void ProcessVectorVehicleParam(Vehicle pParam, Vector3 pValue, float timestep)
        {
-            DetailLog("{0},ProcessVectorVehicleParam,param={1},val={2}", m_prim.LocalID, pParam, pValue);
+            VDetailLog("{0},ProcessVectorVehicleParam,param={1},val={2}", m_prim.LocalID, pParam, pValue);
            switch (pParam)
            {
                case Vehicle.ANGULAR_FRICTION_TIMESCALE:
@@ -266,7 +267,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
        internal void ProcessRotationVehicleParam(Vehicle pParam, Quaternion pValue)
        {
-            DetailLog("{0},ProcessRotationalVehicleParam,param={1},val={2}", m_prim.LocalID, pParam, pValue);
+            VDetailLog("{0},ProcessRotationalVehicleParam,param={1},val={2}", m_prim.LocalID, pParam, pValue);
            switch (pParam)
            {
                case Vehicle.REFERENCE_FRAME:
@@ -280,164 +281,27 @@ namespace OpenSim.Region.Physics.BulletSPlugin
        internal void ProcessVehicleFlags(int pParam, bool remove)
        {
-            DetailLog("{0},ProcessVehicleFlags,param={1},remove={2}", m_prim.LocalID, pParam, remove);
+            VDetailLog("{0},ProcessVehicleFlags,param={1},remove={2}", m_prim.LocalID, pParam, remove);
+            VehicleFlag parm = (VehicleFlag)pParam;
            if (remove)
            {
                if (pParam == -1)
                {
                    m_flags = (VehicleFlag)0;
-                    m_Hoverflags = (VehicleFlag)0;
-                    return;
                }
-                if ((pParam & (int)VehicleFlag.HOVER_GLOBAL_HEIGHT) == (int)VehicleFlag.HOVER_GLOBAL_HEIGHT)
+                else
-                {
-                    if ((m_Hoverflags & VehicleFlag.HOVER_GLOBAL_HEIGHT) != (VehicleFlag)0)
-                        m_Hoverflags &= ~(VehicleFlag.HOVER_GLOBAL_HEIGHT);
-                }
-                if ((pParam & (int)VehicleFlag.HOVER_TERRAIN_ONLY) == (int)VehicleFlag.HOVER_TERRAIN_ONLY)
-                {
-                    if ((m_Hoverflags & VehicleFlag.HOVER_TERRAIN_ONLY) != (VehicleFlag)0)
-                        m_Hoverflags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY);
-                }
-                if ((pParam & (int)VehicleFlag.HOVER_UP_ONLY) == (int)VehicleFlag.HOVER_UP_ONLY)
-                {
-                    if ((m_Hoverflags & VehicleFlag.HOVER_UP_ONLY) != (VehicleFlag)0)
-                        m_Hoverflags &= ~(VehicleFlag.HOVER_UP_ONLY);
-                }
-                if ((pParam & (int)VehicleFlag.HOVER_WATER_ONLY) == (int)VehicleFlag.HOVER_WATER_ONLY)
-                {
-                    if ((m_Hoverflags & VehicleFlag.HOVER_WATER_ONLY) != (VehicleFlag)0)
-                        m_Hoverflags &= ~(VehicleFlag.HOVER_WATER_ONLY);
-                }
-                if ((pParam & (int)VehicleFlag.LIMIT_MOTOR_UP) == (int)VehicleFlag.LIMIT_MOTOR_UP)
-                {
-                    if ((m_flags & VehicleFlag.LIMIT_MOTOR_UP) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.LIMIT_MOTOR_UP);
-                }
-                if ((pParam & (int)VehicleFlag.LIMIT_ROLL_ONLY) == (int)VehicleFlag.LIMIT_ROLL_ONLY)
-                {
-                    if ((m_flags & VehicleFlag.LIMIT_ROLL_ONLY) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.LIMIT_ROLL_ONLY);
-                }
-                if ((pParam & (int)VehicleFlag.MOUSELOOK_BANK) == (int)VehicleFlag.MOUSELOOK_BANK)
-                {
-                    if ((m_flags & VehicleFlag.MOUSELOOK_BANK) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.MOUSELOOK_BANK);
-                }
-                if ((pParam & (int)VehicleFlag.MOUSELOOK_STEER) == (int)VehicleFlag.MOUSELOOK_STEER)
-                {
-                    if ((m_flags & VehicleFlag.MOUSELOOK_STEER) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.MOUSELOOK_STEER);
-                }
-                if ((pParam & (int)VehicleFlag.NO_DEFLECTION_UP) == (int)VehicleFlag.NO_DEFLECTION_UP)
-                {
-                    if ((m_flags & VehicleFlag.NO_DEFLECTION_UP) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP);
-                }
-                if ((pParam & (int)VehicleFlag.CAMERA_DECOUPLED) == (int)VehicleFlag.CAMERA_DECOUPLED)
-                {
-                    if ((m_flags & VehicleFlag.CAMERA_DECOUPLED) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.CAMERA_DECOUPLED);
-                }
-                if ((pParam & (int)VehicleFlag.NO_X) == (int)VehicleFlag.NO_X)
-                {
-                    if ((m_flags & VehicleFlag.NO_X) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.NO_X);
-                }
-                if ((pParam & (int)VehicleFlag.NO_Y) == (int)VehicleFlag.NO_Y)
-                {
-                    if ((m_flags & VehicleFlag.NO_Y) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.NO_Y);
-                }
-                if ((pParam & (int)VehicleFlag.NO_Z) == (int)VehicleFlag.NO_Z)
-                {
-                    if ((m_flags & VehicleFlag.NO_Z) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.NO_Z);
-                }
-                if ((pParam & (int)VehicleFlag.LOCK_HOVER_HEIGHT) == (int)VehicleFlag.LOCK_HOVER_HEIGHT)
-                {
-                    if ((m_Hoverflags & VehicleFlag.LOCK_HOVER_HEIGHT) != (VehicleFlag)0)
-                        m_Hoverflags &= ~(VehicleFlag.LOCK_HOVER_HEIGHT);
-                }
-                if ((pParam & (int)VehicleFlag.NO_DEFLECTION) == (int)VehicleFlag.NO_DEFLECTION)
-                {
-                    if ((m_flags & VehicleFlag.NO_DEFLECTION) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.NO_DEFLECTION);
-                }
-                if ((pParam & (int)VehicleFlag.LOCK_ROTATION) == (int)VehicleFlag.LOCK_ROTATION)
                {
-                    if ((m_flags & VehicleFlag.LOCK_ROTATION) != (VehicleFlag)0)
+                    m_flags &= ~parm;
-                        m_flags &= ~(VehicleFlag.LOCK_ROTATION);
                }
            }
-            else
+            else {
-            {
+                m_flags |= parm;
-                if ((pParam & (int)VehicleFlag.HOVER_GLOBAL_HEIGHT) == (int)VehicleFlag.HOVER_GLOBAL_HEIGHT)
-                {
-                    m_Hoverflags |= (VehicleFlag.HOVER_GLOBAL_HEIGHT | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.HOVER_TERRAIN_ONLY) == (int)VehicleFlag.HOVER_TERRAIN_ONLY)
-                {
-                    m_Hoverflags |= (VehicleFlag.HOVER_TERRAIN_ONLY | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.HOVER_UP_ONLY) == (int)VehicleFlag.HOVER_UP_ONLY)
-                {
-                    m_Hoverflags |= (VehicleFlag.HOVER_UP_ONLY | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.HOVER_WATER_ONLY) == (int)VehicleFlag.HOVER_WATER_ONLY)
-                {
-                    m_Hoverflags |= (VehicleFlag.HOVER_WATER_ONLY | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.LIMIT_MOTOR_UP) == (int)VehicleFlag.LIMIT_MOTOR_UP)
-                {
-                    m_flags |= (VehicleFlag.LIMIT_MOTOR_UP | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.MOUSELOOK_BANK) == (int)VehicleFlag.MOUSELOOK_BANK)
-                {
-                    m_flags |= (VehicleFlag.MOUSELOOK_BANK | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.MOUSELOOK_STEER) == (int)VehicleFlag.MOUSELOOK_STEER)
-                {
-                    m_flags |= (VehicleFlag.MOUSELOOK_STEER | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.NO_DEFLECTION_UP) == (int)VehicleFlag.NO_DEFLECTION_UP)
-                {
-                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.CAMERA_DECOUPLED) == (int)VehicleFlag.CAMERA_DECOUPLED)
-                {
-                    m_flags |= (VehicleFlag.CAMERA_DECOUPLED | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.NO_X) == (int)VehicleFlag.NO_X)
-                {
-                    m_flags |= (VehicleFlag.NO_X);
-                }
-                if ((pParam & (int)VehicleFlag.NO_Y) == (int)VehicleFlag.NO_Y)
-                {
-                    m_flags |= (VehicleFlag.NO_Y);
-                }
-                if ((pParam & (int)VehicleFlag.NO_Z) == (int)VehicleFlag.NO_Z)
-                {
-                    m_flags |= (VehicleFlag.NO_Z);
-                }
-                if ((pParam & (int)VehicleFlag.LOCK_HOVER_HEIGHT) == (int)VehicleFlag.LOCK_HOVER_HEIGHT)
-                {
-                    m_Hoverflags |= (VehicleFlag.LOCK_HOVER_HEIGHT);
-                }
-                if ((pParam & (int)VehicleFlag.NO_DEFLECTION) == (int)VehicleFlag.NO_DEFLECTION)
-                {
-                    m_flags |= (VehicleFlag.NO_DEFLECTION);
-                }
-                if ((pParam & (int)VehicleFlag.LOCK_ROTATION) == (int)VehicleFlag.LOCK_ROTATION)
-                {
-                    m_flags |= (VehicleFlag.LOCK_ROTATION);
-                }
            }
        }//end ProcessVehicleFlags
-        internal void ProcessTypeChange(Vehicle pType)
+        internal void ProcessTypeChange(Vehicle pType, float stepSize)
        {
-            DetailLog("{0},ProcessTypeChange,type={1}", m_prim.LocalID, pType);
+            VDetailLog("{0},ProcessTypeChange,type={1}", m_prim.LocalID, pType);
            // Set Defaults For Type
            m_type = pType;
            switch (pType)
@@ -478,10 +342,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                    // m_bankingMix = 1;
                    // m_bankingTimescale = 10;
                    // m_referenceFrame = Quaternion.Identity;
-                    m_Hoverflags &=
+                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
+                    m_flags &=
                         ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
                           VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
-                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
                    break;
                case Vehicle.TYPE_CAR:
                    m_linearFrictionTimescale = new Vector3(100, 2, 1000);
@@ -506,10 +370,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                    // m_bankingMix = 1;
                    // m_bankingTimescale = 1;
                    // m_referenceFrame = Quaternion.Identity;
-                    m_Hoverflags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY |
                                VehicleFlag.LIMIT_MOTOR_UP);
-                    m_Hoverflags |= (VehicleFlag.HOVER_UP_ONLY);
+                    m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
+                    m_flags |= (VehicleFlag.HOVER_UP_ONLY);
                    break;
                case Vehicle.TYPE_BOAT:
                    m_linearFrictionTimescale = new Vector3(10, 3, 2);
@@ -534,12 +398,12 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                    // m_bankingMix = 0.8f;
                    // m_bankingTimescale = 1;
                    // m_referenceFrame = Quaternion.Identity;
-                    m_Hoverflags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY |
+                    m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY |
                            VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
                    m_flags &= ~(VehicleFlag.LIMIT_ROLL_ONLY);
                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP |
                                VehicleFlag.LIMIT_MOTOR_UP);
-                    m_Hoverflags |= (VehicleFlag.HOVER_WATER_ONLY);
+                    m_flags |= (VehicleFlag.HOVER_WATER_ONLY);
                    break;
                case Vehicle.TYPE_AIRPLANE:
                    m_linearFrictionTimescale = new Vector3(200, 10, 5);
@@ -564,7 +428,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                    // m_bankingMix = 0.7f;
                    // m_bankingTimescale = 2;
                    // m_referenceFrame = Quaternion.Identity;
-                    m_Hoverflags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
+                    m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
                        VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
                    m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_MOTOR_UP);
                    m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY);
@@ -592,11 +456,11 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                    // m_bankingMix = 0.7f;
                    // m_bankingTimescale = 5;
                    // m_referenceFrame = Quaternion.Identity;
-                    m_Hoverflags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
+                    m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
                        VehicleFlag.HOVER_UP_ONLY);
                    m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_MOTOR_UP);
                    m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY);
-                    m_Hoverflags |= (VehicleFlag.HOVER_GLOBAL_HEIGHT);
+                    m_flags |= (VehicleFlag.HOVER_GLOBAL_HEIGHT);
                    break;
            }
        }//end SetDefaultsForType
@@ -613,7 +477,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
            MoveAngular(pTimestep);
            LimitRotation(pTimestep);
-            DetailLog("{0},BSDynamics.Step,done,pos={1},force={2},velocity={3},angvel={4}", 
+            VDetailLog("{0},BSDynamics.Step,done,pos={1},force={2},velocity={3},angvel={4}", 
                    m_prim.LocalID, m_prim.Position, m_prim.Force, m_prim.Velocity, m_prim.RotationalVelocity);
        }// end Step
@@ -657,7 +521,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 */
-                DetailLog("{0},MoveLinear,nonZero,origdir={1},origvel={2},add={3},decay={4},dir={5},vel={6}",
+                VDetailLog("{0},MoveLinear,nonZero,origdir={1},origvel={2},add={3},decay={4},dir={5},vel={6}",
                    m_prim.LocalID, origDir, origVel, addAmount, decayfraction, m_linearMotorDirection, m_lastLinearVelocityVector);
            }
            else
@@ -669,7 +533,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                m_lastLinearVelocityVector = Vector3.Zero;
            }
-            // convert requested object velocity to world-referenced vector
+            // convert requested object velocity to object relative vector
            Quaternion rotq = m_prim.Orientation;
            m_dir = m_lastLinearVelocityVector * rotq;
@@ -722,7 +586,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                if (changed)
                {
                    m_prim.Position = pos;
-                    DetailLog("{0},MoveLinear,blockingEndPoint,block={1},origPos={2},pos={3}",
+                    VDetailLog("{0},MoveLinear,blockingEndPoint,block={1},origPos={2},pos={3}",
                                m_prim.LocalID, m_BlockingEndPoint, posChange, pos);
                }
            }
@@ -732,32 +596,32 @@ namespace OpenSim.Region.Physics.BulletSPlugin
            {
                pos.Z = m_prim.Scene.GetTerrainHeightAtXYZ(pos) + 2;
                m_prim.Position = pos;
-                DetailLog("{0},MoveLinear,terrainHeight,pos={1}", m_prim.LocalID, pos);
+                VDetailLog("{0},MoveLinear,terrainHeight,pos={1}", m_prim.LocalID, pos);
            }
            // Check if hovering
-            if ((m_Hoverflags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0)
+            if ((m_flags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0)
            {
                // We should hover, get the target height
-                if ((m_Hoverflags & VehicleFlag.HOVER_WATER_ONLY) != 0)
+                if ((m_flags & VehicleFlag.HOVER_WATER_ONLY) != 0)
                {
                    m_VhoverTargetHeight = m_prim.Scene.GetWaterLevel() + m_VhoverHeight;
                }
-                if ((m_Hoverflags & VehicleFlag.HOVER_TERRAIN_ONLY) != 0)
+                if ((m_flags & VehicleFlag.HOVER_TERRAIN_ONLY) != 0)
                {
                    m_VhoverTargetHeight = m_prim.Scene.GetTerrainHeightAtXY(pos.X, pos.Y) + m_VhoverHeight;
                }
-                if ((m_Hoverflags & VehicleFlag.HOVER_GLOBAL_HEIGHT) != 0)
+                if ((m_flags & VehicleFlag.HOVER_GLOBAL_HEIGHT) != 0)
                {
                    m_VhoverTargetHeight = m_VhoverHeight;
                }
-                if ((m_Hoverflags & VehicleFlag.HOVER_UP_ONLY) != 0)
+                if ((m_flags & VehicleFlag.HOVER_UP_ONLY) != 0)
                {
                    // If body is aready heigher, use its height as target height
                    if (pos.Z > m_VhoverTargetHeight) m_VhoverTargetHeight = pos.Z;
                }
-                if ((m_Hoverflags & VehicleFlag.LOCK_HOVER_HEIGHT) != 0)
+                if ((m_flags & VehicleFlag.LOCK_HOVER_HEIGHT) != 0)
                {
                    if ((pos.Z - m_VhoverTargetHeight) > .2 || (pos.Z - m_VhoverTargetHeight) < -.2)
                    {
@@ -779,7 +643,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                    }
                }
-                DetailLog("{0},MoveLinear,hover,pos={1},dir={2},height={3},target={4}", m_prim.LocalID, pos, m_dir, m_VhoverHeight, m_VhoverTargetHeight);
+                VDetailLog("{0},MoveLinear,hover,pos={1},dir={2},height={3},target={4}", m_prim.LocalID, pos, m_dir, m_VhoverHeight, m_VhoverTargetHeight);
 //                m_VhoverEfficiency = 0f;    // 0=boucy, 1=Crit.damped
 //                m_VhoverTimescale = 0f;        // time to acheive height
@@ -815,7 +679,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                {
                    grav.Z = (float)(grav.Z * 1.037125);
                }
-                DetailLog("{0},MoveLinear,limitMotorUp,grav={1}", m_prim.LocalID, grav);
+                VDetailLog("{0},MoveLinear,limitMotorUp,grav={1}", m_prim.LocalID, grav);
                //End Experimental Values
            }
            if ((m_flags & (VehicleFlag.NO_X)) != 0)
@@ -844,7 +708,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
            Vector3 decayamount = Vector3.One / (m_linearFrictionTimescale / pTimestep);
            m_lastLinearVelocityVector -= m_lastLinearVelocityVector * decayamount;
-            DetailLog("{0},MoveLinear,done,pos={1},vel={2},force={3},decay={4}", 
+            VDetailLog("{0},MoveLinear,done,pos={1},vel={2},force={3},decay={4}", 
                        m_prim.LocalID, m_lastPositionVector, m_dir, grav, decayamount);
        } // end MoveLinear()
@@ -870,13 +734,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                // There are m_angularMotorApply steps.
                Vector3 origAngularVelocity = m_angularMotorVelocity;
                // ramp up to new value
-                //   current velocity  +=                         error                       /    (time to get there / step interval)
+                //   current velocity  +=                         error                            /    (time to get there / step interval)
                //                               requested speed            -  last motor speed
                m_angularMotorVelocity.X += (m_angularMotorDirection.X - m_angularMotorVelocity.X) /  (m_angularMotorTimescale / pTimestep);
                m_angularMotorVelocity.Y += (m_angularMotorDirection.Y - m_angularMotorVelocity.Y) /  (m_angularMotorTimescale / pTimestep);
                m_angularMotorVelocity.Z += (m_angularMotorDirection.Z - m_angularMotorVelocity.Z) /  (m_angularMotorTimescale / pTimestep);
-                DetailLog("{0},MoveAngular,angularMotorApply,apply={1},origvel={2},dir={3},vel={4}", 
+                VDetailLog("{0},MoveAngular,angularMotorApply,apply={1},origvel={2},dir={3},vel={4}", 
                        m_prim.LocalID,m_angularMotorApply,origAngularVelocity, m_angularMotorDirection, m_angularMotorVelocity);
                m_angularMotorApply--;        // This is done so that if script request rate is less than phys frame rate the expected
@@ -887,6 +751,8 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                // No motor recently applied, keep the body velocity
                // and decay the velocity
                m_angularMotorVelocity -= m_angularMotorVelocity /  (m_angularMotorDecayTimescale / pTimestep);
+                if (m_angularMotorVelocity.LengthSquared() < 0.00001)
+                    m_angularMotorVelocity = Vector3.Zero;
            } // end motor section
            // Vertical attractor section
@@ -924,7 +790,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                vertattr.X += bounce * angularVelocity.X;
                vertattr.Y += bounce * angularVelocity.Y;
-                DetailLog("{0},MoveAngular,verticalAttraction,verterr={1},bounce={2},vertattr={3}", 
+                VDetailLog("{0},MoveAngular,verticalAttraction,verterr={1},bounce={2},vertattr={3}", 
                            m_prim.LocalID, verterr, bounce, vertattr);
            } // else vertical attractor is off
@@ -942,13 +808,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
            {
                m_lastAngularVelocity.X = 0;
                m_lastAngularVelocity.Y = 0;
-                DetailLog("{0},MoveAngular,noDeflectionUp,lastAngular={1}", m_prim.LocalID, m_lastAngularVelocity);
+                VDetailLog("{0},MoveAngular,noDeflectionUp,lastAngular={1}", m_prim.LocalID, m_lastAngularVelocity);
            }
            if (m_lastAngularVelocity.ApproxEquals(Vector3.Zero, 0.01f))
            {
                m_lastAngularVelocity = Vector3.Zero; // Reduce small value to zero.
-                DetailLog("{0},MoveAngular,zeroSmallValues,lastAngular={1}", m_prim.LocalID, m_lastAngularVelocity);
+                VDetailLog("{0},MoveAngular,zeroSmallValues,lastAngular={1}", m_prim.LocalID, m_lastAngularVelocity);
            }
             // apply friction
@@ -958,7 +824,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
            // Apply to the body
            m_prim.RotationalVelocity = m_lastAngularVelocity;
-            DetailLog("{0},MoveAngular,done,decay={1},lastAngular={2}", m_prim.LocalID, decayamount, m_lastAngularVelocity);
+            VDetailLog("{0},MoveAngular,done,decay={1},lastAngular={2}", m_prim.LocalID, decayamount, m_lastAngularVelocity);
        } //end MoveAngular
        internal void LimitRotation(float timestep)
@@ -1005,11 +871,11 @@ namespace OpenSim.Region.Physics.BulletSPlugin
            if (changed)
                m_prim.Orientation = m_rot;
-            DetailLog("{0},LimitRotation,done,changed={1},orig={2},new={3}", m_prim.LocalID, changed, rotq, m_rot);
+            VDetailLog("{0},LimitRotation,done,changed={1},orig={2},new={3}", m_prim.LocalID, changed, rotq, m_rot);
        }
        // Invoke the detailed logger and output something if it's enabled.
-        private void DetailLog(string msg, params Object[] args)
+        private void VDetailLog(string msg, params Object[] args)
        {
            if (m_prim.Scene.VehicleLoggingEnabled)
                m_prim.Scene.PhysicsLogging.Write(msg, args);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 087b9bb..9e3f0db 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -42,6 +42,9 @@ public class BSLinkset
    private BSScene m_physicsScene;
    public BSScene PhysicsScene { get { return m_physicsScene; } }
+    static int m_nextLinksetID = 1;
+    public int LinksetID { get; private set; }
    // The children under the root in this linkset
    private List<BSPrim> m_children;
@@ -74,6 +77,10 @@ public class BSLinkset
    public BSLinkset(BSScene scene, BSPrim parent)
    {
        // A simple linkset of one (no children)
+        LinksetID = m_nextLinksetID++;
+        // We create LOTS of linksets.
+        if (m_nextLinksetID < 0) 
+            m_nextLinksetID = 1;
        m_physicsScene = scene;
        m_linksetRoot = parent;
        m_children = new List<BSPrim>();
@@ -258,8 +265,7 @@ public class BSLinkset
            BSPrim childx = child;
            m_physicsScene.TaintedObject("AddChildToLinkset", delegate()
            {
-                // DebugLog("{0}: AddChildToLinkset: adding child {1} to {2}", LogHeader, child.LocalID, m_linksetRoot.LocalID);
+                DetailLog("{0},AddChildToLinkset,taint,child={1}", m_linksetRoot.LocalID, child.LocalID);
-                // DetailLog("{0},AddChildToLinkset,taint,child={1}", m_linksetRoot.LocalID, child.LocalID);
                PhysicallyLinkAChildToRoot(rootx, childx);     // build the physical binding between me and the child
            });
        }
@@ -287,8 +293,7 @@ public class BSLinkset
            BSPrim childx = child;
            m_physicsScene.TaintedObject("RemoveChildFromLinkset", delegate()
            {
-                // DebugLog("{0}: RemoveChildFromLinkset: Removing constraint to {1}", LogHeader, child.LocalID);
+                DetailLog("{0},RemoveChildFromLinkset,taint,child={1}", m_linksetRoot.LocalID, child.LocalID);
-                // DetailLog("{0},RemoveChildFromLinkset,taint,child={1}", m_linksetRoot.LocalID, child.LocalID);
                PhysicallyUnlinkAChildFromRoot(rootx, childx);
            });
@@ -319,7 +324,6 @@ public class BSLinkset
        // create a constraint that allows no freedom of movement between the two objects
        // http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?t=4818
-        // DebugLog("{0}: CreateLinkset: Adding a constraint between root prim {1} and child prim {2}", LogHeader, LocalID, childPrim.LocalID);
        DetailLog("{0},PhysicallyLinkAChildToRoot,taint,root={1},child={2},rLoc={3},cLoc={4},midLoc={5}", 
            rootPrim.LocalID, rootPrim.LocalID, childPrim.LocalID, rootPrim.Position, childPrim.Position, midPoint);
        BS6DofConstraint constrain = new BS6DofConstraint(
@@ -328,10 +332,10 @@ public class BSLinkset
                        true,
                        true
                        );
-        /* NOTE: attempt to build constraint with full frame computation, etc.
+        /* NOTE: below is an attempt to build constraint with full frame computation, etc.
         *     Using the midpoint is easier since it lets the Bullet code use the transforms
         *     of the objects.
-         * Code left here as an example.
+         * Code left as a warning to future programmers.
        // ==================================================================================
        // relative position normalized to the root prim
        OMV.Quaternion invThisOrientation = OMV.Quaternion.Inverse(rootPrim.Orientation);
@@ -343,7 +347,6 @@ public class BSLinkset
        // create a constraint that allows no freedom of movement between the two objects
        // http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?t=4818
-        // DebugLog("{0}: CreateLinkset: Adding a constraint between root prim {1} and child prim {2}", LogHeader, LocalID, childPrim.LocalID);
        DetailLog("{0},PhysicallyLinkAChildToRoot,taint,root={1},child={2}", rootPrim.LocalID, rootPrim.LocalID, childPrim.LocalID);
        BS6DofConstraint constrain = new BS6DofConstraint(
                        PhysicsScene.World, rootPrim.Body, childPrim.Body,
@@ -382,8 +385,6 @@ public class BSLinkset
    // Called at taint time!
    private void PhysicallyUnlinkAChildFromRoot(BSPrim rootPrim, BSPrim childPrim)
    {
-        // DebugLog("{0}: PhysicallyUnlinkAChildFromRoot: RemoveConstraint between root prim {1} and child prim {2}", 
-        //             LogHeader, rootPrim.LocalID, childPrim.LocalID);
        DetailLog("{0},PhysicallyUnlinkAChildFromRoot,taint,root={1},child={2}", rootPrim.LocalID, rootPrim.LocalID, childPrim.LocalID);
        // Find the constraint for this link and get rid of it from the overall collection and from my list
@@ -397,20 +398,12 @@ public class BSLinkset
    // Called at taint time!
    private void PhysicallyUnlinkAllChildrenFromRoot(BSPrim rootPrim)
    {
-        // DebugLog("{0}: PhysicallyUnlinkAllChildren:", LogHeader);
        DetailLog("{0},PhysicallyUnlinkAllChildren,taint", rootPrim.LocalID);
        m_physicsScene.Constraints.RemoveAndDestroyConstraint(rootPrim.Body);
    }
    // Invoke the detailed logger and output something if it's enabled.
-    private void DebugLog(string msg, params Object[] args)
-    {
-        if (m_physicsScene.ShouldDebugLog)
-            m_physicsScene.Logger.DebugFormat(msg, args);
-    }
-    // Invoke the detailed logger and output something if it's enabled.
    private void DetailLog(string msg, params Object[] args)
    {
        m_physicsScene.PhysicsLogging.Write(msg, args);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 9c20004..d3f1e9c 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -42,8 +42,6 @@ public sealed class BSPrim : PhysicsActor
    private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
    private static readonly string LogHeader = "[BULLETS PRIM]";
-    private void DebugLog(string mm, params Object[] xx) { if (_scene.ShouldDebugLog) m_log.DebugFormat(mm, xx); }
    private IMesh _mesh;
    private PrimitiveBaseShape _pbs;
    private ShapeData.PhysicsShapeType _shapeType;
@@ -141,8 +139,8 @@ public sealed class BSPrim : PhysicsActor
        _friction = _scene.Params.defaultFriction;  // TODO: compute based on object material
        _density = _scene.Params.defaultDensity;    // TODO: compute based on object material
        _restitution = _scene.Params.defaultRestitution;
-        _linkset = new BSLinkset(_scene, this);     // a linkset of one
+        _linkset = new BSLinkset(Scene, this);     // a linkset of one
-        _vehicle = new BSDynamics(this);            // add vehicleness
+        _vehicle = new BSDynamics(Scene, this);            // add vehicleness
        _mass = CalculateMass();
        // do the actual object creation at taint time
        DetailLog("{0},BSPrim.constructor,call", LocalID);
@@ -193,7 +191,7 @@ public sealed class BSPrim : PhysicsActor
            {
                _mass = CalculateMass();   // changing size changes the mass
                BulletSimAPI.SetObjectScaleMass(_scene.WorldID, _localID, _scale, (IsPhysical ? _mass : 0f), IsPhysical);
-                // DetailLog("{0}: BSPrim.setSize: size={1}, mass={2}, physical={3}", LocalID, _size, _mass, IsPhysical);
+                DetailLog("{0}: BSPrim.setSize: size={1}, mass={2}, physical={3}", LocalID, _size, _mass, IsPhysical);
                RecreateGeomAndObject();
            });
        } 
@@ -232,7 +230,6 @@ public sealed class BSPrim : PhysicsActor
        BSPrim parent = obj as BSPrim;
        if (parent != null)
        {
-            DebugLog("{0}: link {1}/{2} to {3}", LogHeader, _avName, _localID, parent.LocalID);
            BSPrim parentBefore = _linkset.LinksetRoot;
            int childrenBefore = _linkset.NumberOfChildren;
@@ -248,8 +245,6 @@ public sealed class BSPrim : PhysicsActor
    public override void delink() {
        // TODO: decide if this parent checking needs to happen at taint time
        // Race condition here: if link() and delink() in same simulation tick, the delink will not happen
-        DebugLog("{0}: delink {1}/{2}. Parent={3}", LogHeader, _avName, _localID, 
-                            _linkset.LinksetRoot._avName+"/"+_linkset.LinksetRoot.LocalID.ToString());
        BSPrim parentBefore = _linkset.LinksetRoot;
        int childrenBefore = _linkset.NumberOfChildren;
@@ -280,7 +275,7 @@ public sealed class BSPrim : PhysicsActor
    public override void LockAngularMotion(OMV.Vector3 axis)
    { 
-        // DetailLog("{0},BSPrim.LockAngularMotion,call,axis={1}", LocalID, axis);
+        DetailLog("{0},BSPrim.LockAngularMotion,call,axis={1}", LocalID, axis);
        return;
    }
@@ -299,7 +294,7 @@ public sealed class BSPrim : PhysicsActor
            // TODO: what does it mean to set the position of a child prim?? Rebuild the constraint?
            _scene.TaintedObject("BSPrim.setPosition", delegate()
            {
-                // DetailLog("{0},BSPrim.SetPosition,taint,pos={1},orient={2}", LocalID, _position, _orientation);
+                DetailLog("{0},BSPrim.SetPosition,taint,pos={1},orient={2}", LocalID, _position, _orientation);
                BulletSimAPI.SetObjectTranslation(_scene.WorldID, _localID, _position, _orientation);
            });
        } 
@@ -336,7 +331,7 @@ public sealed class BSPrim : PhysicsActor
            _force = value;
            _scene.TaintedObject("BSPrim.setForce", delegate()
            {
-                // DetailLog("{0},BSPrim.setForce,taint,force={1}", LocalID, _force);
+                DetailLog("{0},BSPrim.setForce,taint,force={1}", LocalID, _force);
                // BulletSimAPI.SetObjectForce(_scene.WorldID, _localID, _force);
                BulletSimAPI.SetObjectForce2(Body.Ptr, _force);
            });
@@ -354,7 +349,7 @@ public sealed class BSPrim : PhysicsActor
            {
                // Done at taint time so we're sure the physics engine is not using the variables
                // Vehicle code changes the parameters for this vehicle type.
-                _vehicle.ProcessTypeChange(type);
+                _vehicle.ProcessTypeChange(type, Scene.LastSimulatedTimestep);
                // Tell the scene about the vehicle so it will get processing each frame.
                _scene.VehicleInSceneTypeChanged(this, type);
            });
@@ -414,7 +409,7 @@ public sealed class BSPrim : PhysicsActor
            _velocity = value;
            _scene.TaintedObject("BSPrim.setVelocity", delegate()
            {
-                // DetailLog("{0},BSPrim.SetVelocity,taint,vel={1}", LocalID, _velocity);
+                DetailLog("{0},BSPrim.SetVelocity,taint,vel={1}", LocalID, _velocity);
                BulletSimAPI.SetObjectVelocity(_scene.WorldID, LocalID, _velocity);
            });
        } 
@@ -422,7 +417,7 @@ public sealed class BSPrim : PhysicsActor
    public override OMV.Vector3 Torque { 
        get { return _torque; } 
        set { _torque = value; 
-            // DetailLog("{0},BSPrim.SetTorque,call,torque={1}", LocalID, _torque);
+            DetailLog("{0},BSPrim.SetTorque,call,torque={1}", LocalID, _torque);
        } 
    }
    public override float CollisionScore { 
@@ -449,7 +444,7 @@ public sealed class BSPrim : PhysicsActor
            _scene.TaintedObject("BSPrim.setOrientation", delegate()
            {
                // _position = BulletSimAPI.GetObjectPosition(_scene.WorldID, _localID);
-                // DetailLog("{0},BSPrim.setOrientation,taint,pos={1},orient={2}", LocalID, _position, _orientation);
+                DetailLog("{0},BSPrim.setOrientation,taint,pos={1},orient={2}", LocalID, _position, _orientation);
                BulletSimAPI.SetObjectTranslation(_scene.WorldID, _localID, _position, _orientation);
            });
        } 
@@ -486,11 +481,8 @@ public sealed class BSPrim : PhysicsActor
    // No locking here because only called when it is safe
    private void SetObjectDynamic()
    {
-        // RA: remove this for the moment.
+        // If it's becoming dynamic, it will need hullness
-        // The problem is that dynamic objects are hulls so if we are becoming physical
+        VerifyCorrectPhysicalShape();
-        //    the shape has to be checked and possibly built.
-        //    Maybe a VerifyCorrectPhysicalShape() routine?
-        // RecreateGeomAndObject();
        // Bullet wants static objects to have a mass of zero
        float mass = IsStatic ? 0f : _mass;
@@ -501,13 +493,15 @@ public sealed class BSPrim : PhysicsActor
        _linkset.Refresh(this);
        CollisionFlags cf = BulletSimAPI.GetCollisionFlags2(Body.Ptr);
-        // DetailLog("{0},BSPrim.SetObjectDynamic,taint,static={1},solid={2},mass={3}, cf={4}", LocalID, IsStatic, IsSolid, mass, cf);
+        DetailLog("{0},BSPrim.SetObjectDynamic,taint,static={1},solid={2},mass={3}, cf={4}", LocalID, IsStatic, IsSolid, mass, cf);
    }
    // prims don't fly
    public override bool Flying { 
        get { return _flying; } 
-        set { _flying = value; } 
+        set {
+            _flying = value;
+        } 
    }
    public override bool SetAlwaysRun { 
        get { return _setAlwaysRun; } 
@@ -558,7 +552,7 @@ public sealed class BSPrim : PhysicsActor
            // m_log.DebugFormat("{0}: RotationalVelocity={1}", LogHeader, _rotationalVelocity);
            _scene.TaintedObject("BSPrim.setRotationalVelocity", delegate()
            {
-                // DetailLog("{0},BSPrim.SetRotationalVel,taint,rotvel={1}", LocalID, _rotationalVelocity);
+                DetailLog("{0},BSPrim.SetRotationalVel,taint,rotvel={1}", LocalID, _rotationalVelocity);
                BulletSimAPI.SetObjectAngularVelocity(_scene.WorldID, LocalID, _rotationalVelocity);
            });
        } 
@@ -575,7 +569,7 @@ public sealed class BSPrim : PhysicsActor
            _buoyancy = value;
            _scene.TaintedObject("BSPrim.setBuoyancy", delegate()
            {
-                // DetailLog("{0},BSPrim.SetBuoyancy,taint,buoy={1}", LocalID, _buoyancy);
+                DetailLog("{0},BSPrim.SetBuoyancy,taint,buoy={1}", LocalID, _buoyancy);
                BulletSimAPI.SetObjectBuoyancy(_scene.WorldID, _localID, _buoyancy);
            });
        } 
@@ -638,17 +632,17 @@ public sealed class BSPrim : PhysicsActor
                }
                m_accumulatedForces.Clear();
            }
-            // DetailLog("{0},BSPrim.AddObjectForce,taint,force={1}", LocalID, _force);
+            DetailLog("{0},BSPrim.AddObjectForce,taint,force={1}", LocalID, _force);
            BulletSimAPI.AddObjectForce2(Body.Ptr, fSum);
        });
    }
    public override void AddAngularForce(OMV.Vector3 force, bool pushforce) { 
-        // DetailLog("{0},BSPrim.AddAngularForce,call,angForce={1},push={2}", LocalID, force, pushforce);
+        DetailLog("{0},BSPrim.AddAngularForce,call,angForce={1},push={2}", LocalID, force, pushforce);
        // m_log.DebugFormat("{0}: AddAngularForce. f={1}, push={2}", LogHeader, force, pushforce);
    }
    public override void SetMomentum(OMV.Vector3 momentum) { 
-        // DetailLog("{0},BSPrim.SetMomentum,call,mom={1}", LocalID, momentum);
+        DetailLog("{0},BSPrim.SetMomentum,call,mom={1}", LocalID, momentum);
    }
    public override void SubscribeEvents(int ms) { 
        _subscribedEventsMs = ms;
@@ -992,7 +986,7 @@ public sealed class BSPrim : PhysicsActor
                    // m_log.DebugFormat("{0}: CreateGeom: Defaulting to sphere of size {1}", LogHeader, _size);
                    if (forceRebuild || (_shapeType != ShapeData.PhysicsShapeType.SHAPE_SPHERE))
                    {
-                        // DetailLog("{0},BSPrim.CreateGeom,sphere (force={1}", LocalID, forceRebuild);
+                        DetailLog("{0},BSPrim.CreateGeom,sphere (force={1}", LocalID, forceRebuild);
                        _shapeType = ShapeData.PhysicsShapeType.SHAPE_SPHERE;
                        // Bullet native objects are scaled by the Bullet engine so pass the size in
                        _scale = _size;
@@ -1006,7 +1000,7 @@ public sealed class BSPrim : PhysicsActor
                // m_log.DebugFormat("{0}: CreateGeom: Defaulting to box. lid={1}, type={2}, size={3}", LogHeader, LocalID, _shapeType, _size);
                if (forceRebuild || (_shapeType != ShapeData.PhysicsShapeType.SHAPE_BOX))
                {
-                    // DetailLog("{0},BSPrim.CreateGeom,box (force={1})", LocalID, forceRebuild);
+                    DetailLog("{0},BSPrim.CreateGeom,box (force={1})", LocalID, forceRebuild);
                    _shapeType = ShapeData.PhysicsShapeType.SHAPE_BOX;
                    _scale = _size;
                    // TODO: do we need to check for and destroy a mesh or hull that might have been left from before?
@@ -1042,19 +1036,26 @@ public sealed class BSPrim : PhysicsActor
    // No locking here because this is done when we know physics is not simulating
    private void CreateGeomMesh()
    {
-        float lod = _pbs.SculptEntry ? _scene.SculptLOD : _scene.MeshLOD;
+        // level of detail based on size and type of the object
+        float lod = _scene.MeshLOD;
+        if (_pbs.SculptEntry) 
+            lod = _scene.SculptLOD;
+        float maxAxis = Math.Max(_size.X, Math.Max(_size.Y, _size.Z));
+        if (maxAxis > _scene.MeshMegaPrimThreshold) 
+            lod = _scene.MeshMegaPrimLOD;
        ulong newMeshKey = (ulong)_pbs.GetMeshKey(_size, lod);
        // m_log.DebugFormat("{0}: CreateGeomMesh: lID={1}, oldKey={2}, newKey={3}", LogHeader, _localID, _meshKey, newMeshKey);
        // if this new shape is the same as last time, don't recreate the mesh
        if (_meshKey == newMeshKey) return;
-        // DetailLog("{0},BSPrim.CreateGeomMesh,create,key={1}", LocalID, newMeshKey);
+        DetailLog("{0},BSPrim.CreateGeomMesh,create,key={1}", LocalID, newMeshKey);
        // Since we're recreating new, get rid of any previously generated shape
        if (_meshKey != 0)
        {
            // m_log.DebugFormat("{0}: CreateGeom: deleting old mesh. lID={1}, Key={2}", LogHeader, _localID, _meshKey);
-            // DetailLog("{0},BSPrim.CreateGeomMesh,deleteOld,key={1}", LocalID, _meshKey);
+            DetailLog("{0},BSPrim.CreateGeomMesh,deleteOld,key={1}", LocalID, _meshKey);
            BulletSimAPI.DestroyMesh(_scene.WorldID, _meshKey);
            _mesh = null;
            _meshKey = 0;
@@ -1084,7 +1085,7 @@ public sealed class BSPrim : PhysicsActor
        _shapeType = ShapeData.PhysicsShapeType.SHAPE_MESH;
        // meshes are already scaled by the meshmerizer
        _scale = new OMV.Vector3(1f, 1f, 1f);
-        // DetailLog("{0},BSPrim.CreateGeomMesh,done", LocalID);
+        DetailLog("{0},BSPrim.CreateGeomMesh,done", LocalID);
        return;
    }
@@ -1098,13 +1099,13 @@ public sealed class BSPrim : PhysicsActor
        // if the hull hasn't changed, don't rebuild it
        if (newHullKey == _hullKey) return;
-        // DetailLog("{0},BSPrim.CreateGeomHull,create,oldKey={1},newKey={2}", LocalID, _hullKey, newHullKey);
+        DetailLog("{0},BSPrim.CreateGeomHull,create,oldKey={1},newKey={2}", LocalID, _hullKey, newHullKey);
        
        // Since we're recreating new, get rid of any previously generated shape
        if (_hullKey != 0)
        {
            // m_log.DebugFormat("{0}: CreateGeom: deleting old hull. Key={1}", LogHeader, _hullKey);
-            // DetailLog("{0},BSPrim.CreateGeomHull,deleteOldHull,key={1}", LocalID, _hullKey);
+            DetailLog("{0},BSPrim.CreateGeomHull,deleteOldHull,key={1}", LocalID, _hullKey);
            BulletSimAPI.DestroyHull(_scene.WorldID, _hullKey);
            _hullKey = 0;
        }
@@ -1198,7 +1199,7 @@ public sealed class BSPrim : PhysicsActor
        _shapeType = ShapeData.PhysicsShapeType.SHAPE_HULL;
        // meshes are already scaled by the meshmerizer
        _scale = new OMV.Vector3(1f, 1f, 1f);
-        // DetailLog("{0},BSPrim.CreateGeomHull,done", LocalID);
+        DetailLog("{0},BSPrim.CreateGeomHull,done", LocalID);
        return;
    }
@@ -1210,6 +1211,27 @@ public sealed class BSPrim : PhysicsActor
        return;
    }
+    private void VerifyCorrectPhysicalShape()
+    {
+        if (IsStatic)
+        {
+            // if static, we don't need a hull so, if there is one, rebuild without it
+            if (_hullKey != 0)
+            {
+                RecreateGeomAndObject();
+            }
+        }
+        else
+        {
+            // if not static, it will need a hull to efficiently collide with things
+            if (_hullKey == 0)
+            {
+                RecreateGeomAndObject();
+            }
+        }
+    }
    // Create an object in Bullet if it has not already been created
    // No locking here because this is done when the physics engine is not simulating
    // Returns 'true' if an object was actually created.
@@ -1334,10 +1356,8 @@ public sealed class BSPrim : PhysicsActor
            _acceleration = entprop.Acceleration;
            _rotationalVelocity = entprop.RotationalVelocity;
-            // m_log.DebugFormat("{0}: RequestTerseUpdate. id={1}, ch={2}, pos={3}, rot={4}, vel={5}, acc={6}, rvel={7}", 
+            DetailLog("{0},BSPrim.UpdateProperties,call,pos={1},orient={2},vel={3},accel={4},rotVel={5}",
-            //         LogHeader, LocalID, changed, _position, _orientation, _velocity, _acceleration, _rotationalVelocity);
+                    LocalID, _position, _orientation, _velocity, _acceleration, _rotationalVelocity);
-            // DetailLog("{0},BSPrim.UpdateProperties,call,pos={1},orient={2},vel={3},accel={4},rotVel={5}",
-            //         LocalID, _position, _orientation, _velocity, _acceleration, _rotationalVelocity);
            base.RequestPhysicsterseUpdate();
        }
@@ -1353,6 +1373,7 @@ public sealed class BSPrim : PhysicsActor
    }
    // I've collided with something
+    // Called at taint time from within the Step() function
    CollisionEventUpdate collisionCollection;
    public void Collide(uint collidingWith, ActorTypes type, OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth)
    {
@@ -1366,6 +1387,15 @@ public sealed class BSPrim : PhysicsActor
        }
        // DetailLog("{0},BSPrim.Collison,call,with={1}", LocalID, collidingWith);
+        BSPrim collidingWithPrim;
+        if (_scene.Prims.TryGetValue(collidingWith, out collidingWithPrim))
+        {
+            // prims in the same linkset cannot collide with each other
+            if (this.Linkset.LinksetID == collidingWithPrim.Linkset.LinksetID)
+            {
+                return;
+            }
+        }
        // if someone is subscribed to collision events....
        if (_subscribedEventsMs != 0) {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index a31c578..56924aa 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -73,15 +73,22 @@ public class BSScene : PhysicsScene, IPhysicsParameters
    private static readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
    private static readonly string LogHeader = "[BULLETS SCENE]";
-    public void DebugLog(string mm, params Object[] xx) { if (ShouldDebugLog) m_log.DebugFormat(mm, xx); }
+    // The name of the region we're working for.
+    public string RegionName { get; private set; }
    public string BulletSimVersion = "?";
    private Dictionary<uint, BSCharacter> m_avatars = new Dictionary<uint, BSCharacter>();
+    public Dictionary<uint, BSCharacter> Characters { get { return m_avatars; } }
    private Dictionary<uint, BSPrim> m_prims = new Dictionary<uint, BSPrim>();
+    public Dictionary<uint, BSPrim> Prims { get { return m_prims; } }
    private HashSet<BSCharacter> m_avatarsWithCollisions = new HashSet<BSCharacter>();
    private HashSet<BSPrim> m_primsWithCollisions = new HashSet<BSPrim>();
    private List<BSPrim> m_vehicles = new List<BSPrim>();
    private float[] m_heightMap;
    private float m_waterLevel;
    private uint m_worldID;
@@ -95,16 +102,11 @@ public class BSScene : PhysicsScene, IPhysicsParameters
    private int m_detailedStatsStep = 0;
    public IMesher mesher;
-    private float m_meshLOD;
+    // Level of Detail values kept as float because that's what the Meshmerizer wants
-    public float MeshLOD
+    public float MeshLOD { get; private set; }
-    {
+    public float MeshMegaPrimLOD { get; private set; }
-        get { return m_meshLOD; }
+    public float MeshMegaPrimThreshold { get; private set; }
-    }
+    public float SculptLOD { get; private set; }
-    private float m_sculptLOD;
-    public float SculptLOD
-    {
-        get { return m_sculptLOD; }
-    }
    private BulletSim m_worldSim;
    public BulletSim World
@@ -179,8 +181,9 @@ public class BSScene : PhysicsScene, IPhysicsParameters
    ConfigurationParameters[] m_params;
    GCHandle m_paramsHandle;
-    public bool ShouldDebugLog { get; private set; }
+    // Handle to the callback used by the unmanaged code to call into the managed code.
+    // Used for debug logging.
+    // Need to store the handle in a persistant variable so it won't be freed.
    private BulletSimAPI.DebugLogCallback m_DebugLogCallbackHandle;
    // Sometimes you just have to log everything.
@@ -196,6 +199,8 @@ public class BSScene : PhysicsScene, IPhysicsParameters
    public BSScene(string identifier)
    {
        m_initialized = false;
+        // we are passed the name of the region we're working for.
+        RegionName = identifier;
    }
    public override void Initialise(IMesher meshmerizer, IConfigSource config)
@@ -281,10 +286,13 @@ public class BSScene : PhysicsScene, IPhysicsParameters
                // Very detailed logging for physics debugging
                m_physicsLoggingEnabled = pConfig.GetBoolean("PhysicsLoggingEnabled", false);
                m_physicsLoggingDir = pConfig.GetString("PhysicsLoggingDir", ".");
-                m_physicsLoggingPrefix = pConfig.GetString("PhysicsLoggingPrefix", "physics-");
+                m_physicsLoggingPrefix = pConfig.GetString("PhysicsLoggingPrefix", "physics-%REGIONNAME%-");
                m_physicsLoggingFileMinutes = pConfig.GetInt("PhysicsLoggingFileMinutes", 5);
                // Very detailed logging for vehicle debugging
                m_vehicleLoggingEnabled = pConfig.GetBoolean("VehicleLoggingEnabled", false);
+                // Do any replacements in the parameters
+                m_physicsLoggingPrefix = m_physicsLoggingPrefix.Replace("%REGIONNAME%", RegionName);
            }
        }
    }
@@ -362,7 +370,7 @@ public class BSScene : PhysicsScene, IPhysicsParameters
        BSPrim bsprim = prim as BSPrim;
        if (bsprim != null)
        {
-            // DetailLog("{0},RemovePrim,call", bsprim.LocalID);
+            DetailLog("{0},RemovePrim,call", bsprim.LocalID);
            // m_log.DebugFormat("{0}: RemovePrim. id={1}/{2}", LogHeader, bsprim.Name, bsprim.LocalID);
            try
            {
@@ -388,7 +396,7 @@ public class BSScene : PhysicsScene, IPhysicsParameters
        if (!m_initialized) return null;
-        // DetailLog("{0},AddPrimShape,call", localID);
+        DetailLog("{0},AddPrimShape,call", localID);
        BSPrim prim = new BSPrim(localID, primName, this, position, size, rotation, pbs, isPhysical);
        lock (m_prims) m_prims.Add(localID, prim);
@@ -429,13 +437,13 @@ public class BSScene : PhysicsScene, IPhysicsParameters
        {
            numSubSteps = BulletSimAPI.PhysicsStep(m_worldID, timeStep, m_maxSubSteps, m_fixedTimeStep,
                        out updatedEntityCount, out updatedEntitiesPtr, out collidersCount, out collidersPtr);
-            // DetailLog("{0},Simulate,call, substeps={1}, updates={2}, colliders={3}", DetailLogZero, numSubSteps, updatedEntityCount, collidersCount); 
+            DetailLog("{0},Simulate,call, substeps={1}, updates={2}, colliders={3}", DetailLogZero, numSubSteps, updatedEntityCount, collidersCount); 
        }
        catch (Exception e)
        {
            m_log.WarnFormat("{0},PhysicsStep Exception: substeps={1}, updates={2}, colliders={3}, e={4}", LogHeader, numSubSteps, updatedEntityCount, collidersCount, e);
            // DetailLog("{0},PhysicsStepException,call, substeps={1}, updates={2}, colliders={3}", DetailLogZero, numSubSteps, updatedEntityCount, collidersCount);
-            // updatedEntityCount = 0;
+            updatedEntityCount = 0;
            collidersCount = 0;
        }
@@ -534,6 +542,8 @@ public class BSScene : PhysicsScene, IPhysicsParameters
        else if (m_avatars.ContainsKey(collidingWith))
            type = ActorTypes.Agent;
+        // DetailLog("{0},BSScene.SendCollision,collide,id={1},with={2}", DetailLogZero, localID, collidingWith);
        BSPrim prim;
        if (m_prims.TryGetValue(localID, out prim)) {
            prim.Collide(collidingWith, type, collidePoint, collideNormal, penitration);
@@ -897,16 +907,26 @@ public class BSScene : PhysicsScene, IPhysicsParameters
            (s) => { return s.NumericBool(s._forceSimplePrimMeshing); },
            (s,p,l,v) => { s._forceSimplePrimMeshing = s.BoolNumeric(v); } ),
-        new ParameterDefn("MeshLOD", "Level of detail to render meshes (32, 16, 8 or 4. 32=most detailed)",
+        new ParameterDefn("MeshLevelOfDetail", "Level of detail to render meshes (32, 16, 8 or 4. 32=most detailed)",
            8f,
-            (s,cf,p,v) => { s.m_meshLOD = cf.GetInt(p, (int)v); },
+            (s,cf,p,v) => { s.MeshLOD = (float)cf.GetInt(p, (int)v); },
-            (s) => { return (float)s.m_meshLOD; },
+            (s) => { return s.MeshLOD; },
-            (s,p,l,v) => { s.m_meshLOD = (int)v; } ),
+            (s,p,l,v) => { s.MeshLOD = v; } ),
-        new ParameterDefn("SculptLOD", "Level of detail to render sculpties (32, 16, 8 or 4. 32=most detailed)",
+        new ParameterDefn("MeshLevelOfDetailMegaPrim", "Level of detail to render meshes larger than threshold meters",
+            16f,
+            (s,cf,p,v) => { s.MeshMegaPrimLOD = (float)cf.GetInt(p, (int)v); },
+            (s) => { return s.MeshMegaPrimLOD; },
+            (s,p,l,v) => { s.MeshMegaPrimLOD = v; } ),
+        new ParameterDefn("MeshLevelOfDetailMegaPrimThreshold", "Size (in meters) of a mesh before using MeshMegaPrimLOD",
+            10f,
+            (s,cf,p,v) => { s.MeshMegaPrimThreshold = (float)cf.GetInt(p, (int)v); },
+            (s) => { return s.MeshMegaPrimThreshold; },
+            (s,p,l,v) => { s.MeshMegaPrimThreshold = v; } ),
+        new ParameterDefn("SculptLevelOfDetail", "Level of detail to render sculpties (32, 16, 8 or 4. 32=most detailed)",
            32f,
-            (s,cf,p,v) => { s.m_sculptLOD = cf.GetInt(p, (int)v); },
+            (s,cf,p,v) => { s.SculptLOD = (float)cf.GetInt(p, (int)v); },
-            (s) => { return (float)s.m_sculptLOD; },
+            (s) => { return s.SculptLOD; },
-            (s,p,l,v) => { s.m_sculptLOD = (int)v; } ),
+            (s,p,l,v) => { s.SculptLOD = v; } ),
        new ParameterDefn("MaxSubStep", "In simulation step, maximum number of substeps",
            10f,
@@ -1137,12 +1157,6 @@ public class BSScene : PhysicsScene, IPhysicsParameters
            (s,cf,p,v) => { s.m_detailedStatsStep = cf.GetInt(p, (int)v); },
            (s) => { return (float)s.m_detailedStatsStep; },
            (s,p,l,v) => { s.m_detailedStatsStep = (int)v; } ),
-        new ParameterDefn("ShouldDebugLog", "Enables detailed DEBUG log statements",
-            ConfigurationParameters.numericFalse,
-            (s,cf,p,v) => { s.ShouldDebugLog = cf.GetBoolean(p, s.BoolNumeric(v)); },
-            (s) => { return s.NumericBool(s.ShouldDebugLog); },
-            (s,p,l,v) => { s.ShouldDebugLog = s.BoolNumeric(v); } ),
    };
    // Convert a boolean to our numeric true and false values
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d5e611c..4335592 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -426,14 +426,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            return key;
        }
-        // convert a LSL_Rotation to a Quaternion
-        public static Quaternion Rot2Quaternion(LSL_Rotation r)
-        {
-            Quaternion q = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
-            q.Normalize();
-            return q;
-        }
        //These are the implementations of the various ll-functions used by the LSL scripts.
        public LSL_Float llSin(double f)
        {
@@ -1240,9 +1232,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Float llGround(LSL_Vector offset)
        {
            m_host.AddScriptLPS(1);
-            Vector3 pos = m_host.GetWorldPosition() + new Vector3((float)offset.x,
+            Vector3 pos = m_host.GetWorldPosition() + (Vector3)offset;
-                                                                  (float)offset.y,
-                                                                  (float)offset.z);
            //Get the slope normal.  This gives us the equation of the plane tangent to the slope.
            LSL_Vector vsn = llGroundNormal(offset);
@@ -1492,31 +1482,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            if (part == null || part.ParentGroup.IsDeleted)
                return;
-            if (scale.x < 0.01)
+            // First we need to check whether or not we need to clamp the size of a physics-enabled prim
-                scale.x = 0.01;
-            if (scale.y < 0.01)
-                scale.y = 0.01;
-            if (scale.z < 0.01)
-                scale.z = 0.01;
            PhysicsActor pa = part.ParentGroup.RootPart.PhysActor;
            if (pa != null && pa.IsPhysical)
            {
-                if (scale.x > World.m_maxPhys)
+                scale.x = Math.Max(World.m_minPhys, Math.Min(World.m_maxPhys, scale.x));
-                    scale.x = World.m_maxPhys;
+                scale.y = Math.Max(World.m_minPhys, Math.Min(World.m_maxPhys, scale.y));
-                if (scale.y > World.m_maxPhys)
+                scale.z = Math.Max(World.m_minPhys, Math.Min(World.m_maxPhys, scale.z));
-                    scale.y = World.m_maxPhys;
+            }
-                if (scale.z > World.m_maxPhys)
+            else
-                    scale.z = World.m_maxPhys;
+            {
+                // If not physical, then we clamp the scale to the non-physical min/max
+                scale.x = Math.Max(World.m_minNonphys, Math.Min(World.m_maxNonphys, scale.x));
+                scale.y = Math.Max(World.m_minNonphys, Math.Min(World.m_maxNonphys, scale.y));
+                scale.z = Math.Max(World.m_minNonphys, Math.Min(World.m_maxNonphys, scale.z));
            }
-            if (scale.x > World.m_maxNonphys)
-                scale.x = World.m_maxNonphys;
-            if (scale.y > World.m_maxNonphys)
-                scale.y = World.m_maxNonphys;
-            if (scale.z > World.m_maxNonphys)
-                scale.z = World.m_maxNonphys;
            Vector3 tmp = part.Scale;
            tmp.X = (float)scale.x;
@@ -1590,7 +1570,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            if (face == ScriptBaseClass.ALL_SIDES)
                face = SceneObjectPart.ALL_SIDES;
-            m_host.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face);
+            m_host.SetFaceColorAlpha(face, color, null);
        }
        public void SetTexGen(SceneObjectPart part, int face,int style)
@@ -2220,7 +2200,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            bool sameParcel = here.GlobalID == there.GlobalID;
-            if (!sameParcel && !World.Permissions.CanObjectEntry(m_host.UUID, false, new Vector3((float)pos.x, (float)pos.y, (float)pos.z)))
+            if (!sameParcel && !World.Permissions.CanRezObject(
+                m_host.ParentGroup.PrimCount, m_host.ParentGroup.OwnerID, pos))
            {
                return 0;
            }
@@ -2279,16 +2260,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            if (part.ParentGroup.RootPart == part)
            {
                SceneObjectGroup parent = part.ParentGroup;
-                Vector3 dest = new Vector3((float)toPos.x, (float)toPos.y, (float)toPos.z);
+                if (!World.Permissions.CanObjectEntry(parent.UUID, false, (Vector3)toPos))
-                if (!World.Permissions.CanObjectEntry(parent.UUID, false, dest))
                    return;
                Util.FireAndForget(delegate(object x) {
-                    parent.UpdateGroupPosition(dest);
+                    parent.UpdateGroupPosition((Vector3)toPos);
                });
            }
            else
            {
-                part.OffsetPosition = new Vector3((float)toPos.x, (float)toPos.y, (float)toPos.z);
+                part.OffsetPosition = (Vector3)toPos;
                SceneObjectGroup parent = part.ParentGroup;
                parent.HasGroupChanged = true;
                parent.ScheduleGroupForTerseUpdate();
@@ -2326,7 +2306,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    pos = part.AbsolutePosition;
            }
-            return new LSL_Vector(pos.X, pos.Y, pos.Z);
+//            m_log.DebugFormat("[LSL API]: Returning {0} in GetPartLocalPos()", pos);
+            return new LSL_Vector(pos);
        }
        public void llSetRot(LSL_Rotation rot)
@@ -2343,7 +2325,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                // using it would cause attachments and HUDs to rotate
                // to the wrong positions.
                
-                SetRot(m_host, Rot2Quaternion(rot));
+                SetRot(m_host, rot);
            }
            else
            {
@@ -2353,7 +2335,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                {
                    rootPart = m_host.ParentGroup.RootPart;
                    if (rootPart != null)
-                        SetRot(m_host, rootPart.RotationOffset * Rot2Quaternion(rot));
+                        SetRot(m_host, rootPart.RotationOffset * (Quaternion)rot);
                }
            }
@@ -2363,8 +2345,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void llSetLocalRot(LSL_Rotation rot)
        {
            m_host.AddScriptLPS(1);
+            SetRot(m_host, rot);
-            SetRot(m_host, Rot2Quaternion(rot));
            ScriptSleep(200);
        }
@@ -2476,7 +2457,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                if (local != 0)
                    force *= llGetRot();
-                m_host.ParentGroup.RootPart.SetForce(new Vector3((float)force.x, (float)force.y, (float)force.z));
+                m_host.ParentGroup.RootPart.SetForce(force);
            }
        }
@@ -2488,10 +2469,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            if (!m_host.ParentGroup.IsDeleted)
            {
-                Vector3 tmpForce = m_host.ParentGroup.RootPart.GetForce();
+                force = m_host.ParentGroup.RootPart.GetForce();
-                force.x = tmpForce.X;
-                force.y = tmpForce.Y;
-                force.z = tmpForce.Z;
            }
            return force;
@@ -2500,8 +2478,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Integer llTarget(LSL_Vector position, double range)
        {
            m_host.AddScriptLPS(1);
-            return m_host.ParentGroup.registerTargetWaypoint(
+            return m_host.ParentGroup.registerTargetWaypoint(position,
-                new Vector3((float)position.x, (float)position.y, (float)position.z), (float)range);
+                (float)range);
        }
        public void llTargetRemove(int number)
@@ -2513,8 +2491,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Integer llRotTarget(LSL_Rotation rot, double error)
        {
            m_host.AddScriptLPS(1);
-            return m_host.ParentGroup.registerRotTargetWaypoint(
+            return m_host.ParentGroup.registerRotTargetWaypoint(rot, (float)error);
-                new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), (float)error);
        }
        public void llRotTargetRemove(int number)
@@ -2526,7 +2503,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void llMoveToTarget(LSL_Vector target, double tau)
        {
            m_host.AddScriptLPS(1);
-            m_host.MoveToTarget(new Vector3((float)target.x, (float)target.y, (float)target.z), (float)tau);
+            m_host.MoveToTarget(target, (float)tau);
        }
        public void llStopMoveToTarget()
@@ -2539,7 +2516,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            m_host.AddScriptLPS(1);
            //No energy force yet
-            Vector3 v = new Vector3((float)force.x, (float)force.y, (float)force.z);
+            Vector3 v = force;
            if (v.Length() > 20000.0f)
            {
                v.Normalize();
@@ -2552,13 +2529,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void llApplyRotationalImpulse(LSL_Vector force, int local)
        {
            m_host.AddScriptLPS(1);
-            m_host.ParentGroup.RootPart.ApplyAngularImpulse(new Vector3((float)force.x, (float)force.y, (float)force.z), local != 0);
+            m_host.ParentGroup.RootPart.ApplyAngularImpulse(force, local != 0);
        }
        public void llSetTorque(LSL_Vector torque, int local)
        {
            m_host.AddScriptLPS(1);
-            m_host.ParentGroup.RootPart.SetAngularImpulse(new Vector3((float)torque.x, (float)torque.y, (float)torque.z), local != 0);
+            m_host.ParentGroup.RootPart.SetAngularImpulse(torque, local != 0);
        }
        public LSL_Vector llGetTorque()
@@ -3123,13 +3100,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    return;
                }
-                Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z);
-                Vector3 llvel = new Vector3((float)vel.x, (float)vel.y, (float)vel.z);
                // need the magnitude later
                // float velmag = (float)Util.GetMagnitude(llvel);
-                SceneObjectGroup new_group = World.RezObject(m_host, item, llpos, Rot2Quaternion(rot), llvel, param);
+                SceneObjectGroup new_group = World.RezObject(m_host, item, pos, rot, vel, param);
                // If either of these are null, then there was an unknown error.
                if (new_group == null)
@@ -3156,11 +3130,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                PhysicsActor pa = new_group.RootPart.PhysActor;
-                if (pa != null && pa.IsPhysical && llvel != Vector3.Zero)
+                if (pa != null && pa.IsPhysical && (Vector3)vel != Vector3.Zero)
                {
                    float groupmass = new_group.GetMass();
-                    llvel *= -groupmass;
+                    vel *= -groupmass;
-                    llApplyImpulse(new LSL_Vector(llvel.X, llvel.Y,llvel.Z), 0);
+                    llApplyImpulse(vel, 0);
                }
                // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)
                return;
@@ -3211,7 +3185,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    return;
                }
-                m_host.StartLookAt(Rot2Quaternion(r3 * r2 * r1), (float)strength, (float)damping);
+                m_host.StartLookAt((Quaternion)(r3 * r2 * r1), (float)strength, (float)damping);
            }
        }
@@ -3637,7 +3611,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            }
            else
            {
-                m_host.RotLookAt(Rot2Quaternion(target), (float)strength, (float)damping);
+                m_host.RotLookAt(target, (float)strength, (float)damping);
            }
        }
@@ -3718,7 +3692,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        protected void TargetOmega(SceneObjectPart part, LSL_Vector axis, double spinrate, double gain)
        {
-            part.UpdateAngularVelocity(new Vector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate)));
+            part.UpdateAngularVelocity(axis * spinrate);
         }
        public LSL_Integer llGetStartParameter()
@@ -3928,7 +3902,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                try
                {
                    foreach (SceneObjectPart part in parts)
-                        part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face);
+                        part.SetFaceColorAlpha(face, color, null);
                }
                finally
                {
@@ -4398,9 +4372,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void llSetText(string text, LSL_Vector color, double alpha)
        {
            m_host.AddScriptLPS(1);
-            Vector3 av3 = new Vector3(Util.Clip((float)color.x, 0.0f, 1.0f),
+            Vector3 av3 = Util.Clip(color, 0.0f, 1.0f);
-                                      Util.Clip((float)color.y, 0.0f, 1.0f),
-                                      Util.Clip((float)color.z, 0.0f, 1.0f));
            m_host.SetText(text.Length > 254 ? text.Remove(254) : text, av3, Util.Clip((float)alpha, 0.0f, 1.0f));
            //m_host.ParentGroup.HasGroupChanged = true;
            //m_host.ParentGroup.ScheduleGroupForFullUpdate();
@@ -4616,14 +4588,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            ScriptSleep(5000);
        }
-        public void llTeleportAgent(string agent, string destination, LSL_Vector pos, LSL_Vector lookAt)
+        public void llTeleportAgent(string agent, string destination, LSL_Vector targetPos, LSL_Vector targetLookAt)
        {
            m_host.AddScriptLPS(1);
            UUID agentId = new UUID();
-            Vector3 targetPos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z);
-            Vector3 targetLookAt = new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z);
            if (UUID.TryParse(agent, out agentId))
            {
                ScenePresence presence = World.GetScenePresence(agentId);
@@ -4652,15 +4621,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            }
        }
-        public void llTeleportAgentGlobalCoords(string agent, LSL_Vector global_coords, LSL_Vector pos, LSL_Vector lookAt)
+        public void llTeleportAgentGlobalCoords(string agent, LSL_Vector global_coords, LSL_Vector targetPos, LSL_Vector targetLookAt)
        {
            m_host.AddScriptLPS(1);
            UUID agentId = new UUID();
            ulong regionHandle = Utils.UIntsToLong((uint)global_coords.x, (uint)global_coords.y);
-            Vector3 targetPos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z);
-            Vector3 targetLookAt = new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z);
            if (UUID.TryParse(agent, out agentId))
            {
                ScenePresence presence = World.GetScenePresence(agentId);
@@ -4957,7 +4924,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    distance_attenuation = 1f / normalized_units;
                }
-                Vector3 applied_linear_impulse = new Vector3((float)impulse.x, (float)impulse.y, (float)impulse.z);
+                Vector3 applied_linear_impulse = impulse;
                {
                    float impulse_length = applied_linear_impulse.Length();
@@ -5605,25 +5572,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// separated list. There is a space after
        /// each comma.
        /// </summary>
        public LSL_String llList2CSV(LSL_List src)
        {
-            string ret = String.Empty;
-            int    x   = 0;
            m_host.AddScriptLPS(1);
-            if (src.Data.Length > 0)
+            return string.Join(", ", 
-            {
+                    (new List<object>(src.Data)).ConvertAll<string>(o => 
-                ret = src.Data[x++].ToString();
+                    {
-                for (; x < src.Data.Length; x++)
+                        return o.ToString();
-                {
+                    }).ToArray());
-                    ret += ", "+src.Data[x].ToString();
-                }
-            }
-            return ret;
        }
        /// <summary>
@@ -6296,19 +6253,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            m_host.AddScriptLPS(1);
            List<SceneObjectPart> parts = GetLinkParts(linknumber);
-            if (parts.Count > 0)
+            try
            {
-                try
+                foreach (SceneObjectPart part in parts)
-                {
-                    foreach (var part in parts)
-                    {
-                        SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
-                    }
-                }
-                finally
                {
+                    SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
                }
            }
+            finally
+            {
+            }
        }
        private void SetTextureAnim(SceneObjectPart part, int mode, int face, int sizex, int sizey, double start, double length, double rate)
@@ -6526,9 +6481,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            //Plug the x,y coordinates of the slope normal into the equation of the plane to get
            //the height of that point on the plane.  The resulting vector gives the slope.
-            Vector3 vsl = new Vector3();
+            Vector3 vsl = vsn;
-            vsl.X = (float)vsn.x;
-            vsl.Y = (float)vsn.y;
            vsl.Z = (float)(((vsn.x * vsn.x) + (vsn.y * vsn.y)) / (-1 * vsn.z));
            vsl.Normalize();
            //Normalization might be overkill here
@@ -6539,9 +6492,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Vector llGroundNormal(LSL_Vector offset)
        {
            m_host.AddScriptLPS(1);
-            Vector3 pos = m_host.GetWorldPosition() + new Vector3((float)offset.x,
+            Vector3 pos = m_host.GetWorldPosition() + (Vector3)offset;
-                                                                (float)offset.y,
-                                                                (float)offset.z);
            // Clamp to valid position
            if (pos.X < 0)
                pos.X = 0;
@@ -6706,7 +6657,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            List<SceneObjectPart> parts = GetLinkParts(linknumber);
-            foreach (var part in parts)
+            foreach (SceneObjectPart part in parts)
            {
                SetParticleSystem(part, rules);
            }
@@ -6995,8 +6946,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            if (!m_host.ParentGroup.IsDeleted)
            {
-                m_host.ParentGroup.RootPart.SetVehicleVectorParam(param,
+                m_host.ParentGroup.RootPart.SetVehicleVectorParam(param, vec);
-                    new Vector3((float)vec.x, (float)vec.y, (float)vec.z));
            }
        }
@@ -7008,7 +6958,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            if (!m_host.ParentGroup.IsDeleted)
            {
-                m_host.ParentGroup.RootPart.SetVehicleRotationParam(param, Rot2Quaternion(rot));
+                m_host.ParentGroup.RootPart.SetVehicleRotationParam(param, rot);
            }
        }
@@ -7038,8 +6988,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            if (rot.s == 0 && rot.x == 0 && rot.y == 0 && rot.z == 0)
                rot.s = 1; // ZERO_ROTATION = 0,0,0,1
-            part.SitTargetPosition = new Vector3((float)offset.x, (float)offset.y, (float)offset.z);
+            part.SitTargetPosition = offset;
-            part.SitTargetOrientation = Rot2Quaternion(rot);
+            part.SitTargetOrientation = rot;
            part.ParentGroup.HasGroupChanged = true;
        }
@@ -7142,13 +7092,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void llSetCameraEyeOffset(LSL_Vector offset)
        {
            m_host.AddScriptLPS(1);
-            m_host.SetCameraEyeOffset(new Vector3((float)offset.x, (float)offset.y, (float)offset.z));
+            m_host.SetCameraEyeOffset(offset);
        }
        public void llSetCameraAtOffset(LSL_Vector offset)
        {
            m_host.AddScriptLPS(1);
-            m_host.SetCameraAtOffset(new Vector3((float)offset.x, (float)offset.y, (float)offset.z));
+            m_host.SetCameraAtOffset(offset);
        }
        public LSL_String llDumpList2String(LSL_List src, string seperator)
@@ -7170,7 +7120,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Integer llScriptDanger(LSL_Vector pos)
        {
            m_host.AddScriptLPS(1);
-            bool result = World.ScriptDanger(m_host.LocalId, new Vector3((float)pos.x, (float)pos.y, (float)pos.z));
+            bool result = World.ScriptDanger(m_host.LocalId, pos);
            if (result)
            {
                return 1;
@@ -7752,7 +7702,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            m_host.AddScriptLPS(1);
-            setLinkPrimParams(ScriptBaseClass.LINK_THIS, rules);
+            setLinkPrimParams(ScriptBaseClass.LINK_THIS, rules, "llSetPrimitiveParams");
            ScriptSleep(200);
        }
@@ -7761,10 +7711,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            m_host.AddScriptLPS(1);
-            setLinkPrimParams(linknumber, rules);
+            setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParamsFast");
+            ScriptSleep(200);
        }
-        private void setLinkPrimParams(int linknumber, LSL_List rules)
+        private void setLinkPrimParams(int linknumber, LSL_List rules, string originFunc)
        {
            List<object> parts = new List<object>();
            List<SceneObjectPart> prims = GetLinkParts(linknumber);
@@ -7775,15 +7727,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                parts.Add(p);
            LSL_List remaining = null;
+            uint rulesParsed = 0;
            if (parts.Count > 0)
            {
                foreach (object part in parts)
                {
                    if (part is SceneObjectPart)
-                        remaining = SetPrimParams((SceneObjectPart)part, rules);
+                        remaining = SetPrimParams((SceneObjectPart)part, rules, originFunc, ref rulesParsed);
                    else
-                        remaining = SetPrimParams((ScenePresence)part, rules);
+                        remaining = SetPrimParams((ScenePresence)part, rules, originFunc, ref rulesParsed);
                }
                while ((object)remaining != null && remaining.Length > 2)
@@ -7802,9 +7755,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    foreach (object part in parts)
                    {
                        if (part is SceneObjectPart)
-                            remaining = SetPrimParams((SceneObjectPart)part, rules);
+                            remaining = SetPrimParams((SceneObjectPart)part, rules, originFunc, ref rulesParsed);
                        else
-                            remaining = SetPrimParams((ScenePresence)part, rules);
+                            remaining = SetPrimParams((ScenePresence)part, rules, originFunc, ref rulesParsed);
                    }
                }
            }
@@ -7842,6 +7795,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
        {
+            setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams");
            llSetLinkPrimitiveParamsFast(linknumber, rules);
            ScriptSleep(200);
        }
@@ -7869,195 +7823,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            return new Vector3((float)x, (float)y, (float)z);
        }
-        protected LSL_List SetPrimParams(ScenePresence av, LSL_List rules)
+        protected LSL_List SetPrimParams(SceneObjectPart part, LSL_List rules, string originFunc, ref uint rulesParsed)
-        {
-            //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
-            int idx = 0;
-            bool positionChanged = false;
-            Vector3 finalPos = Vector3.Zero;
-            try
-            {
-                while (idx < rules.Length)
-                {
-                    int code = rules.GetLSLIntegerItem(idx++);
-                    int remain = rules.Length - idx;
-                    switch (code)
-                    {
-                        case (int)ScriptBaseClass.PRIM_POSITION:
-                        case (int)ScriptBaseClass.PRIM_POS_LOCAL:
-                            {
-                                if (remain < 1)
-                                    return null;
-                                LSL_Vector v;
-                                v = rules.GetVector3Item(idx++);
-                                SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
-                                if (part == null)
-                                    break;
-                                LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
-                                LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
-                                if (part.LinkNum > 1)
-                                {
-                                    localRot = GetPartLocalRot(part);
-                                    localPos = GetPartLocalPos(part);
-                                }
-                                v -= localPos;
-                                v /= localRot;
-                                LSL_Vector sitOffset = (llRot2Up(new LSL_Rotation(av.Rotation.X, av.Rotation.Y, av.Rotation.Z, av.Rotation.W)) * av.Appearance.AvatarHeight * 0.02638f);
-                                v = v + 2 * sitOffset;
-                                av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
-                                av.SendAvatarDataToAllAgents();
-                            }
-                            break;
-                        case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
-                        case (int)ScriptBaseClass.PRIM_ROTATION:
-                            {
-                                if (remain < 1)
-                                    return null;
-                                LSL_Rotation r;
-                                r = rules.GetQuaternionItem(idx++);
-                                SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
-                                if (part == null)
-                                    break;
-                                LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
-                                LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
-                                if (part.LinkNum > 1)
-                                    localRot = GetPartLocalRot(part);
-                                r = r * llGetRootRotation() / localRot;
-                                av.Rotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
-                                av.SendAvatarDataToAllAgents();
-                            }
-                            break;
-                        // parse rest doing nothing but number of parameters error check
-                        case (int)ScriptBaseClass.PRIM_SIZE:
-                        case (int)ScriptBaseClass.PRIM_MATERIAL:
-                        case (int)ScriptBaseClass.PRIM_PHANTOM:
-                        case (int)ScriptBaseClass.PRIM_PHYSICS:
-                        case (int)ScriptBaseClass.PRIM_PHYSICS_SHAPE_TYPE:
-                        case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
-                        case (int)ScriptBaseClass.PRIM_NAME:
-                        case (int)ScriptBaseClass.PRIM_DESC:
-                            if (remain < 1)
-                                return null;
-                            idx++;
-                            break;
-                        case (int)ScriptBaseClass.PRIM_GLOW:
-                        case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
-                        case (int)ScriptBaseClass.PRIM_TEXGEN:
-                            if (remain < 2)
-                                return null;
-                            idx += 2;
-                            break;
-                        case (int)ScriptBaseClass.PRIM_TYPE:
-                            if (remain < 3)
-                                return null;
-                            code = (int)rules.GetLSLIntegerItem(idx++);
-                            remain = rules.Length - idx;
-                            switch (code)
-                            {
-                                case (int)ScriptBaseClass.PRIM_TYPE_BOX:
-                                case (int)ScriptBaseClass.PRIM_TYPE_CYLINDER:
-                                case (int)ScriptBaseClass.PRIM_TYPE_PRISM:
-                                    if (remain < 6)
-                                        return null;
-                                    idx += 6;
-                                    break;
-                                case (int)ScriptBaseClass.PRIM_TYPE_SPHERE:
-                                    if (remain < 5)
-                                        return null;
-                                    idx += 5;
-                                    break;
-                                case (int)ScriptBaseClass.PRIM_TYPE_TORUS:
-                                case (int)ScriptBaseClass.PRIM_TYPE_TUBE:
-                                case (int)ScriptBaseClass.PRIM_TYPE_RING:
-                                    if (remain < 11)
-                                        return null;
-                                    idx += 11;
-                                    break;
-                                case (int)ScriptBaseClass.PRIM_TYPE_SCULPT:
-                                    if (remain < 2)
-                                        return null;
-                                    idx += 2;
-                                    break;
-                            }
-                            break;
-                        case (int)ScriptBaseClass.PRIM_COLOR:
-                        case (int)ScriptBaseClass.PRIM_TEXT:
-                        case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
-                        case (int)ScriptBaseClass.PRIM_OMEGA:
-                            if (remain < 3)
-                                return null;
-                            idx += 3;
-                            break;
-                        case (int)ScriptBaseClass.PRIM_TEXTURE:
-                        case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
-                        case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL:
-                            if (remain < 5)
-                                return null;
-                            idx += 5;
-                            break;
-                        case (int)ScriptBaseClass.PRIM_FLEXIBLE:
-                            if (remain < 7)
-                                return null;
-                            idx += 7;
-                            break;
-                        case (int)ScriptBaseClass.PRIM_LINK_TARGET:
-                            if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
-                                return null;
-                            return rules.GetSublist(idx, -1);
-                    }
-                }
-            }
-            finally
-            {
-                if (positionChanged)
-                {
-                    av.OffsetPosition = finalPos;
-//                    av.SendAvatarDataToAllAgents();
-                    av.SendTerseUpdateToAllClients();
-                    positionChanged = false;
-                }
-            }
-            return null;
-        }
-        protected LSL_List SetPrimParams(SceneObjectPart part, LSL_List rules)
        {
            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
                return null;
            int idx = 0;
+            int idxStart = 0;
            SceneObjectGroup parentgrp = part.ParentGroup;
@@ -8068,9 +7840,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            {
                while (idx < rules.Length)
                {
+                    ++rulesParsed;
                    int code = rules.GetLSLIntegerItem(idx++);
                    int remain = rules.Length - idx;
+                    idxStart = idx;
                    int face;
                    LSL_Vector v;
@@ -8105,13 +7879,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                            if (rootPart == part)
                            {
                                // special case: If we are root, rotate complete SOG to new rotation
-                                SetRot(part, Rot2Quaternion(q));
+                                SetRot(part, q);
                            }
                            else
                            {
                                // we are a child. The rotation values will be set to the one of root modified by rot, as in SL. Don't ask.
                                // sounds like sl bug that we need to replicate
-                                SetRot(part, rootPart.RotationOffset * Rot2Quaternion(q));
+                                SetRot(part, rootPart.RotationOffset * (Quaternion)q);
                            }
                            break;
@@ -8285,8 +8059,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                            LSL_Vector color=rules.GetVector3Item(idx++);
                            double alpha=(double)rules.GetLSLFloatItem(idx++);
-                            part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face);
+                            part.SetFaceColorAlpha(face, color, alpha);
-                            SetAlpha(part, alpha, face);
                            break;
@@ -8434,9 +8207,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                            string primText = rules.GetLSLStringItem(idx++);
                            LSL_Vector primTextColor = rules.GetVector3Item(idx++);
                            LSL_Float primTextAlpha = rules.GetLSLFloatItem(idx++);
-                            Vector3 av3 = new Vector3(Util.Clip((float)primTextColor.x, 0.0f, 1.0f),
+                            Vector3 av3 = Util.Clip(primTextColor, 0.0f, 1.0f);
-                                          Util.Clip((float)primTextColor.y, 0.0f, 1.0f),
-                                          Util.Clip((float)primTextColor.z, 0.0f, 1.0f));
                            part.SetText(primText, av3, Util.Clip((float)primTextAlpha, 0.0f, 1.0f));
                            break;
@@ -8455,8 +8226,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                        case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
                            if (remain < 1)
                                return null;
-                            LSL_Rotation lr = rules.GetQuaternionItem(idx++);
+                            SetRot(part, rules.GetQuaternionItem(idx++));
-                            SetRot(part, Rot2Quaternion(lr));
                            break;
                        case (int)ScriptBaseClass.PRIM_OMEGA:
                            if (remain < 3)
@@ -8466,7 +8236,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                            LSL_Float gain = rules.GetLSLFloatItem(idx++);
                            TargetOmega(part, axis, (double)spinrate, (double)gain);
                            break;
+                        case (int)ScriptBaseClass.PRIM_SLICE:
+                            if (remain < 1)
+                                return null;
+                            LSL_Vector slice = rules.GetVector3Item(idx++);
+                            part.UpdateSlice((float)slice.x, (float)slice.y);
+                            break;
                        case (int)ScriptBaseClass.PRIM_LINK_TARGET:
                            if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
                                return null;
@@ -8475,6 +8250,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    }
                }
            }
+            catch (InvalidCastException e)
+            {
+                ShoutError(string.Format(
+                        "{0} error running rule #{1}: arg #{2} ",
+                        originFunc, rulesParsed, idx - idxStart) + e.Message);
+            }
            finally
            {
                if (positionChanged)
@@ -8483,12 +8264,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    {
                        SceneObjectGroup parent = part.ParentGroup;
                        Util.FireAndForget(delegate(object x) {
-                            parent.UpdateGroupPosition(new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z));
+                            parent.UpdateGroupPosition(currentPosition);
                        });
                    }
                    else
                    {
-                        part.OffsetPosition = new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z);
+                        part.OffsetPosition = currentPosition;
                        SceneObjectGroup parent = part.ParentGroup;
                        parent.HasGroupChanged = true;
                        parent.ScheduleGroupForTerseUpdate();
@@ -8866,7 +8647,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_List llGetPrimitiveParams(LSL_List rules)
        {
            m_host.AddScriptLPS(1);
-            return GetLinkPrimitiveParams(m_host, rules);
+            LSL_List result = new LSL_List();
+            LSL_List remaining = GetPrimParams(m_host, rules, ref result);
+            while (remaining != null && remaining.Length > 2)
+            {
+                int linknumber = remaining.GetLSLIntegerItem(0);
+                rules = remaining.GetSublist(1, -1);
+                List<SceneObjectPart> parts = GetLinkParts(linknumber);
+                foreach (SceneObjectPart part in parts)
+                    remaining = GetPrimParams(part, rules, ref result);
+            }
+            return result;
        }
        public LSL_List llGetLinkPrimitiveParams(int linknumber, LSL_List rules)
@@ -8876,294 +8672,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            // acording to SL wiki this must indicate a single link number or link_root or link_this.
            // keep other options as before
-            List<SceneObjectPart> parts = GetLinkParts(linknumber);
+            List<SceneObjectPart> parts;
-            List<ScenePresence> avatars = GetLinkAvatars(linknumber);
+            List<ScenePresence> avatars;
+            
            LSL_List res = new LSL_List();
+            LSL_List remaining = null;
-            if (parts.Count > 0)
+            while (rules.Length > 0)
            {
-                foreach (var part in parts)
+                parts = GetLinkParts(linknumber);
+                avatars = GetLinkAvatars(linknumber);
+                remaining = null;
+                foreach (SceneObjectPart part in parts)
                {
-                    LSL_List partRes = GetLinkPrimitiveParams(part, rules);
+                    remaining = GetPrimParams(part, rules, ref res);
-                    res += partRes;
                }
-            }
-            if (avatars.Count > 0)
-            {
                foreach (ScenePresence avatar in avatars)
                {
-                    LSL_List avaRes = GetLinkPrimitiveParams(avatar, rules);
+                    remaining = GetPrimParams(avatar, rules, ref res);
-                    res += avaRes;
                }
-            }
-            return res;
-        }
-        public LSL_List GetLinkPrimitiveParams(ScenePresence avatar, LSL_List rules)
-        {
-            // avatars case
-            // replies as SL wiki
-            LSL_List res = new LSL_List();
-//            SceneObjectPart sitPart = avatar.ParentPart; // most likelly it will be needed
-            SceneObjectPart sitPart = World.GetSceneObjectPart(avatar.ParentID); // maybe better do this expensive search for it in case it's gone??
-            int idx = 0;
+                if (remaining != null && remaining.Length > 0)
-            while (idx < rules.Length)
-            {
-                int code = (int)rules.GetLSLIntegerItem(idx++);
-                int remain = rules.Length - idx;
-                switch (code)
                {
-                    case (int)ScriptBaseClass.PRIM_MATERIAL:
+                    linknumber = remaining.GetLSLIntegerItem(0);
-                        res.Add(new LSL_Integer((int)SOPMaterialData.SopMaterial.Flesh));
+                    rules = remaining.GetSublist(1, -1);
-                        break;
-                    case (int)ScriptBaseClass.PRIM_PHYSICS:
-                            res.Add(new LSL_Integer(0));
-                        break;
-                    case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
-                            res.Add(new LSL_Integer(0));
-                        break;
-                    case (int)ScriptBaseClass.PRIM_PHANTOM:
-                            res.Add(new LSL_Integer(0));
-                        break;
-                    case (int)ScriptBaseClass.PRIM_POSITION:
-                        Vector3 pos = avatar.OffsetPosition;
-                        Vector3 sitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f *2.0f);
-                        pos -= sitOffset;
-                        if( sitPart != null)
-                            pos = sitPart.GetWorldPosition() + pos * sitPart.GetWorldRotation();
-                        res.Add(new LSL_Vector(pos.X,pos.Y,pos.Z));
-                        break;
-                    case (int)ScriptBaseClass.PRIM_SIZE:
-                        // as in llGetAgentSize above
-                        res.Add(new LSL_Vector(0.45f, 0.6f, avatar.Appearance.AvatarHeight));
-                        break;
-                    case (int)ScriptBaseClass.PRIM_ROTATION:
-                        Quaternion rot = avatar.Rotation;
-                        if (sitPart != null)
-                        {
-                            rot = sitPart.GetWorldRotation() * rot; // apply sit part world rotation
-                        }
-                        res.Add(new LSL_Rotation (rot.X, rot.Y, rot.Z, rot.W));
-                        break;
-                    case (int)ScriptBaseClass.PRIM_TYPE:
-                        res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TYPE_BOX));
-                        res.Add(new LSL_Integer(ScriptBaseClass.PRIM_HOLE_DEFAULT));
-                        res.Add(new LSL_Vector(0f,1.0f,0f));
-                        res.Add(new LSL_Float(0.0f));
-                        res.Add(new LSL_Vector(0, 0, 0));
-                        res.Add(new LSL_Vector(1.0f,1.0f,0f));
-                        res.Add(new LSL_Vector(0, 0, 0));
-                        break;
-                    case (int)ScriptBaseClass.PRIM_TEXTURE:
-                        if (remain < 1)
-                            return res;
-                        int face = (int)rules.GetLSLIntegerItem(idx++);
-                        if (face == ScriptBaseClass.ALL_SIDES)
-                        {
-                            for (face = 0; face < 21; face++)
-                            {
-                                res.Add(new LSL_String(""));
-                                res.Add(new LSL_Vector(0,0,0));
-                                res.Add(new LSL_Vector(0,0,0));
-                                res.Add(new LSL_Float(0.0));
-                            }
-                        }
-                        else
-                        {
-                            if (face >= 0 && face < 21)
-                            {
-                                res.Add(new LSL_String(""));
-                                res.Add(new LSL_Vector(0,0,0));
-                                res.Add(new LSL_Vector(0,0,0));
-                                res.Add(new LSL_Float(0.0));
-                            }
-                        }
-                        break;
-                    case (int)ScriptBaseClass.PRIM_COLOR:
-                        if (remain < 1)
-                            return res;
-                        face = (int)rules.GetLSLIntegerItem(idx++);
-                        if (face == ScriptBaseClass.ALL_SIDES)
-                        {
-                            for (face = 0; face < 21; face++)
-                            {
-                                res.Add(new LSL_Vector(0,0,0));
-                                res.Add(new LSL_Float(0));
-                            }
-                        }
-                        else
-                        {
-                                res.Add(new LSL_Vector(0,0,0));
-                                res.Add(new LSL_Float(0));
-                        }
-                        break;
-                    case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
-                        if (remain < 1)
-                            return res;
-                        face = (int)rules.GetLSLIntegerItem(idx++);
-                        if (face == ScriptBaseClass.ALL_SIDES)
-                        {
-                            for (face = 0; face < 21; face++)
-                            {
-                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_SHINY_NONE));
-                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_BUMP_NONE));
-                            }
-                        }
-                        else
-                        {
-                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_SHINY_NONE));
-                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_BUMP_NONE));
-                        }
-                        break;
-                    case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
-                        if (remain < 1)
-                            return res;
-                        face = (int)rules.GetLSLIntegerItem(idx++);
-                        if (face == ScriptBaseClass.ALL_SIDES)
-                        {
-                            for (face = 0; face < 21; face++)
-                            {
-                                res.Add(new LSL_Integer(ScriptBaseClass.FALSE));
-                            }
-                        }
-                        else
-                        {
-                                res.Add(new LSL_Integer(ScriptBaseClass.FALSE));
-                        }
-                        break;
-                    case (int)ScriptBaseClass.PRIM_FLEXIBLE:
-                        res.Add(new LSL_Integer(0));
-                        res.Add(new LSL_Integer(0));// softness
-                        res.Add(new LSL_Float(0.0f));   // gravity
-                        res.Add(new LSL_Float(0.0f));      // friction
-                        res.Add(new LSL_Float(0.0f));      // wind
-                        res.Add(new LSL_Float(0.0f));   // tension
-                        res.Add(new LSL_Vector(0f,0f,0f));
-                        break;
-                    case (int)ScriptBaseClass.PRIM_TEXGEN:
-                        // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
-                        if (remain < 1)
-                            return res;
-                        face = (int)rules.GetLSLIntegerItem(idx++);
-                        if (face == ScriptBaseClass.ALL_SIDES)
-                        {
-                            for (face = 0; face < 21; face++)
-                            {
-                                    res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
-                            }
-                        }
-                        else
-                        {
-                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
-                        }
-                        break;
-                    case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
-                        res.Add(new LSL_Integer(0));
-                        res.Add(new LSL_Vector(0f,0f,0f));
-                        res.Add(new LSL_Float(0f)); // intensity
-                        res.Add(new LSL_Float(0f));    // radius
-                        res.Add(new LSL_Float(0f));   // falloff
-                        break;
-                    case (int)ScriptBaseClass.PRIM_GLOW:
-                        if (remain < 1)
-                            return res;
-                        face = (int)rules.GetLSLIntegerItem(idx++);
-                        if (face == ScriptBaseClass.ALL_SIDES)
-                        {
-                            for (face = 0; face < 21; face++)
-                            {
-                                res.Add(new LSL_Float(0f));
-                            }
-                        }
-                        else
-                        {
-                                res.Add(new LSL_Float(0f));
-                        }
-                        break;
-                    case (int)ScriptBaseClass.PRIM_TEXT:
-                        res.Add(new LSL_String(""));
-                        res.Add(new LSL_Vector(0f,0f,0f));
-                        res.Add(new LSL_Float(1.0f));
-                        break;
-                    case (int)ScriptBaseClass.PRIM_NAME:
-                        res.Add(new LSL_String(avatar.Name));
-                        break;
-                    case (int)ScriptBaseClass.PRIM_DESC:
-                        res.Add(new LSL_String(""));
-                        break;
-                    case (int)ScriptBaseClass.PRIM_ROT_LOCAL:                      
-                        Quaternion lrot = avatar.Rotation;
-                        if (sitPart != null && sitPart != sitPart.ParentGroup.RootPart)
-                        {
-                            lrot = sitPart.RotationOffset * lrot; // apply sit part rotation offset
-                        }
-                        res.Add(new LSL_Rotation(lrot.X, lrot.Y, lrot.Z, lrot.W));
-                        break;
-                    case (int)ScriptBaseClass.PRIM_POS_LOCAL:
-                        Vector3 lpos = avatar.OffsetPosition; // pos relative to sit part
-                        Vector3 lsitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f * 2.0f);
-                        lpos -= lsitOffset;
-                        if (sitPart != null && sitPart != sitPart.ParentGroup.RootPart)
-                        {
-                            lpos = sitPart.OffsetPosition + (lpos * sitPart.RotationOffset); // make it relative to root prim
-                        }
-                        res.Add(new LSL_Vector(lpos.X,lpos.Y,lpos.Z));
-                        break;
-                    case (int)ScriptBaseClass.PRIM_LINK_TARGET:
-                        if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
-                            return res;
-                        LSL_Integer new_linknumber = rules.GetLSLIntegerItem(idx++);
-                        LSL_List new_rules = rules.GetSublist(idx, -1);
-                        res += llGetLinkPrimitiveParams((int)new_linknumber, new_rules);
-                        return res;
                }
            }
            return res;
        }
-        public LSL_List GetLinkPrimitiveParams(SceneObjectPart part, LSL_List rules)
+        public LSL_List GetPrimParams(SceneObjectPart part, LSL_List rules, ref LSL_List res)
        {
-            LSL_List res = new LSL_List();
            int idx=0;
            while (idx < rules.Length)
            {
@@ -9301,7 +8842,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    case (int)ScriptBaseClass.PRIM_TEXTURE:
                        if (remain < 1)
-                            return res;
+                            return null;
                        int face = (int)rules.GetLSLIntegerItem(idx++);
                        Primitive.TextureEntry tex = part.Shape.Textures;
@@ -9341,7 +8882,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    case (int)ScriptBaseClass.PRIM_COLOR:
                        if (remain < 1)
-                            return res;
+                            return null;
                        face=(int)rules.GetLSLIntegerItem(idx++);
@@ -9370,7 +8911,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
                        if (remain < 1)
-                            return res;
+                            return null;
                        face = (int)rules.GetLSLIntegerItem(idx++);
                        tex = part.Shape.Textures;
@@ -9426,7 +8968,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
                        if (remain < 1)
-                            return res;
+                            return null;
                        face = (int)rules.GetLSLIntegerItem(idx++);
                        tex = part.Shape.Textures;
@@ -9480,7 +9023,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    case (int)ScriptBaseClass.PRIM_TEXGEN:
                        // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
                        if (remain < 1)
-                            return res;
+                            return null;
                        face = (int)rules.GetLSLIntegerItem(idx++);
                        tex = part.Shape.Textures;
@@ -9528,7 +9072,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    case (int)ScriptBaseClass.PRIM_GLOW:
                        if (remain < 1)
-                            return res;
+                            return null;
                        face = (int)rules.GetLSLIntegerItem(idx++);
                        tex = part.Shape.Textures;
@@ -9572,18 +9117,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    case (int)ScriptBaseClass.PRIM_POS_LOCAL:
                        res.Add(new LSL_Vector(GetPartLocalPos(part)));
                        break;
+                    case (int)ScriptBaseClass.PRIM_SLICE:
+                        PrimType prim_type = part.GetPrimType();
+                        bool useProfileBeginEnd = (prim_type == PrimType.SPHERE || prim_type == PrimType.TORUS || prim_type == PrimType.TUBE || prim_type == PrimType.RING);
+                        res.Add(new LSL_Vector(
+                            (useProfileBeginEnd ? part.Shape.ProfileBegin : part.Shape.PathBegin) / 50000.0,
+                            1 - (useProfileBeginEnd ? part.Shape.ProfileEnd : part.Shape.PathEnd) / 50000.0,
+                            0
+                        ));
+                        break;
                    case (int)ScriptBaseClass.PRIM_LINK_TARGET:
-                        if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
+                        if(remain < 3)
-                            return res;
+                            return null;
-                        LSL_Integer new_linknumber = rules.GetLSLIntegerItem(idx++);
-                        LSL_List new_rules = rules.GetSublist(idx, -1);
+                        return rules.GetSublist(idx, -1);
-                        LSL_List tres = llGetLinkPrimitiveParams((int)new_linknumber, new_rules);
-                        res += tres;
-                        return res;                       
                }
            }
-            return res;
+            return null;
        }
        public LSL_List llGetPrimMediaParams(int face, LSL_List rules)
@@ -11166,9 +10717,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
            if (avatar != null)
            {
-                avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name, simname,
+                avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name,
-                                                                   new Vector3((float)pos.x, (float)pos.y, (float)pos.z),
+                    simname, pos, lookAt);
-                                                                   new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z));
            }
            
            ScriptSleep(1000);
@@ -11903,13 +11453,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                    else
                                        rot = obj.GetWorldRotation();
-                                    LSL_Rotation objrot = new LSL_Rotation(rot.X, rot.Y, rot.Z, rot.W);
+                                    LSL_Rotation objrot = new LSL_Rotation(rot);
                                    ret.Add(objrot);
                                }
                                break;
                            case ScriptBaseClass.OBJECT_VELOCITY:
-                                Vector3 ovel = obj.Velocity;
+                                ret.Add(new LSL_Vector(obj.Velocity));
-                                ret.Add(new LSL_Vector(ovel.X, ovel.Y, ovel.Z));
                                break;
                            case ScriptBaseClass.OBJECT_OWNER:
                                ret.Add(new LSL_String(obj.OwnerID.ToString()));
@@ -12122,7 +11671,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            return tid.ToString();
        }
-        public void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules)
+        public void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc)
        {
            SceneObjectPart obj = World.GetSceneObjectPart(new UUID(prim));
            if (obj == null)
@@ -12131,28 +11680,41 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            if (obj.OwnerID != m_host.OwnerID)
                return;
-            LSL_List remaining = SetPrimParams(obj, rules);
+            uint rulesParsed = 0;
+            LSL_List remaining = SetPrimParams(obj, rules, originFunc, ref rulesParsed);
            while ((object)remaining != null && remaining.Length > 2)
            {
                LSL_Integer newLink = remaining.GetLSLIntegerItem(0);
                LSL_List newrules = remaining.GetSublist(1, -1);
                foreach(SceneObjectPart part in GetLinkParts(obj, newLink)){
-                    remaining = SetPrimParams(part, newrules);
+                    remaining = SetPrimParams(part, newrules, originFunc, ref rulesParsed);
                }
            }
        }
-        public LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules)
+        public LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules)
        {
            SceneObjectPart obj = World.GetSceneObjectPart(new UUID(prim));
-            if (obj == null)
-                return new LSL_List();
-            if (obj.OwnerID != m_host.OwnerID)
+            LSL_List result = new LSL_List();
-                return new LSL_List();
+            if (obj != null && obj.OwnerID != m_host.OwnerID)
+            {
+                LSL_List remaining = GetPrimParams(obj, rules, ref result);
-            return GetLinkPrimitiveParams(obj, rules);
+                while (remaining != null && remaining.Length > 2)
+                {
+                    int linknumber = remaining.GetLSLIntegerItem(0);
+                    rules = remaining.GetSublist(1, -1);
+                    List<SceneObjectPart> parts = GetLinkParts(linknumber);
+                    foreach (SceneObjectPart part in parts)
+                        remaining = GetPrimParams(part, rules, ref result);
+                }
+            }
+            return result;
        }
        public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
@@ -12515,8 +12077,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            m_host.AddScriptLPS(1);
-            Vector3 rayStart = new Vector3((float)start.x, (float)start.y, (float)start.z);
+            Vector3 rayStart = start;
-            Vector3 rayEnd = new Vector3((float)end.x, (float)end.y, (float)end.z);
+            Vector3 rayEnd = end;
            Vector3 dir = rayEnd - rayStart;
            float dist = Vector3.Mag(dir);
@@ -13090,6 +12652,455 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                }
            }
        }
+        protected LSL_List SetPrimParams(ScenePresence av, LSL_List rules, string originFunc, ref uint rulesParsed)
+        {
+            //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
+            int idx = 0;
+            int idxStart = 0;
+            bool positionChanged = false;
+            Vector3 finalPos = Vector3.Zero;
+            try
+            {
+                while (idx < rules.Length)
+                {
+                    ++rulesParsed;
+                    int code = rules.GetLSLIntegerItem(idx++);
+                    int remain = rules.Length - idx;
+                    idxStart = idx;
+                    switch (code)
+                    {
+                        case (int)ScriptBaseClass.PRIM_POSITION:
+                        case (int)ScriptBaseClass.PRIM_POS_LOCAL:
+                            {
+                                if (remain < 1)
+                                    return null;
+                                LSL_Vector v;
+                                v = rules.GetVector3Item(idx++);
+                                SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
+                                if (part == null)
+                                    break;
+                                LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
+                                LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
+                                if (part.LinkNum > 1)
+                                {
+                                    localRot = GetPartLocalRot(part);
+                                    localPos = GetPartLocalPos(part);
+                                }
+                                v -= localPos;
+                                v /= localRot;
+                                LSL_Vector sitOffset = (llRot2Up(new LSL_Rotation(av.Rotation.X, av.Rotation.Y, av.Rotation.Z, av.Rotation.W)) * av.Appearance.AvatarHeight * 0.02638f);
+                                v = v + 2 * sitOffset;
+                                av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
+                                av.SendAvatarDataToAllAgents();
+                            }
+                            break;
+                        case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
+                        case (int)ScriptBaseClass.PRIM_ROTATION:
+                            {
+                                if (remain < 1)
+                                    return null;
+                                LSL_Rotation r;
+                                r = rules.GetQuaternionItem(idx++);
+                                SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
+                                if (part == null)
+                                    break;
+                                LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
+                                LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
+                                if (part.LinkNum > 1)
+                                    localRot = GetPartLocalRot(part);
+                                r = r * llGetRootRotation() / localRot;
+                                av.Rotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
+                                av.SendAvatarDataToAllAgents();
+                            }
+                            break;
+                        // parse rest doing nothing but number of parameters error check
+                        case (int)ScriptBaseClass.PRIM_SIZE:
+                        case (int)ScriptBaseClass.PRIM_MATERIAL:
+                        case (int)ScriptBaseClass.PRIM_PHANTOM:
+                        case (int)ScriptBaseClass.PRIM_PHYSICS:
+                        case (int)ScriptBaseClass.PRIM_PHYSICS_SHAPE_TYPE:
+                        case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
+                        case (int)ScriptBaseClass.PRIM_NAME:
+                        case (int)ScriptBaseClass.PRIM_DESC:
+                            if (remain < 1)
+                                return null;
+                            idx++;
+                            break;
+                        case (int)ScriptBaseClass.PRIM_GLOW:
+                        case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
+                        case (int)ScriptBaseClass.PRIM_TEXGEN:
+                            if (remain < 2)
+                                return null;
+                            idx += 2;
+                            break;
+                        case (int)ScriptBaseClass.PRIM_TYPE:
+                            if (remain < 3)
+                                return null;
+                            code = (int)rules.GetLSLIntegerItem(idx++);
+                            remain = rules.Length - idx;
+                            switch (code)
+                            {
+                                case (int)ScriptBaseClass.PRIM_TYPE_BOX:
+                                case (int)ScriptBaseClass.PRIM_TYPE_CYLINDER:
+                                case (int)ScriptBaseClass.PRIM_TYPE_PRISM:
+                                    if (remain < 6)
+                                        return null;
+                                    idx += 6;
+                                    break;
+                                case (int)ScriptBaseClass.PRIM_TYPE_SPHERE:
+                                    if (remain < 5)
+                                        return null;
+                                    idx += 5;
+                                    break;
+                                case (int)ScriptBaseClass.PRIM_TYPE_TORUS:
+                                case (int)ScriptBaseClass.PRIM_TYPE_TUBE:
+                                case (int)ScriptBaseClass.PRIM_TYPE_RING:
+                                    if (remain < 11)
+                                        return null;
+                                    idx += 11;
+                                    break;
+                                case (int)ScriptBaseClass.PRIM_TYPE_SCULPT:
+                                    if (remain < 2)
+                                        return null;
+                                    idx += 2;
+                                    break;
+                            }
+                            break;
+                        case (int)ScriptBaseClass.PRIM_COLOR:
+                        case (int)ScriptBaseClass.PRIM_TEXT:
+                        case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
+                        case (int)ScriptBaseClass.PRIM_OMEGA:
+                            if (remain < 3)
+                                return null;
+                            idx += 3;
+                            break;
+                        case (int)ScriptBaseClass.PRIM_TEXTURE:
+                        case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
+                        case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL:
+                            if (remain < 5)
+                                return null;
+                            idx += 5;
+                            break;
+                        case (int)ScriptBaseClass.PRIM_FLEXIBLE:
+                            if (remain < 7)
+                                return null;
+                            idx += 7;
+                            break;
+                        case (int)ScriptBaseClass.PRIM_LINK_TARGET:
+                            if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
+                                return null;
+                            return rules.GetSublist(idx, -1);
+                    }
+                }
+            }
+            catch (InvalidCastException e)
+            {
+                ShoutError(string.Format(
+                        "{0} error running rule #{1}: arg #{2} ",
+                        originFunc, rulesParsed, idx - idxStart) + e.Message);
+            }
+            finally
+            {
+                if (positionChanged)
+                {
+                    av.OffsetPosition = finalPos;
+//                    av.SendAvatarDataToAllAgents();
+                    av.SendTerseUpdateToAllClients();
+                    positionChanged = false;
+                }
+            }
+            return null;
+        }
+        public LSL_List GetPrimParams(ScenePresence avatar, LSL_List rules, ref LSL_List res)
+        {
+            // avatars case
+            // replies as SL wiki
+//            SceneObjectPart sitPart = avatar.ParentPart; // most likelly it will be needed
+            SceneObjectPart sitPart = World.GetSceneObjectPart(avatar.ParentID); // maybe better do this expensive search for it in case it's gone??
+            int idx = 0;
+            while (idx < rules.Length)
+            {
+                int code = (int)rules.GetLSLIntegerItem(idx++);
+                int remain = rules.Length - idx;
+                switch (code)
+                {
+                    case (int)ScriptBaseClass.PRIM_MATERIAL:
+                        res.Add(new LSL_Integer((int)SOPMaterialData.SopMaterial.Flesh));
+                        break;
+                    case (int)ScriptBaseClass.PRIM_PHYSICS:
+                            res.Add(new LSL_Integer(0));
+                        break;
+                    case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
+                            res.Add(new LSL_Integer(0));
+                        break;
+                    case (int)ScriptBaseClass.PRIM_PHANTOM:
+                            res.Add(new LSL_Integer(0));
+                        break;
+                    case (int)ScriptBaseClass.PRIM_POSITION:
+                        Vector3 pos = avatar.OffsetPosition;
+                        Vector3 sitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f *2.0f);
+                        pos -= sitOffset;
+                        if( sitPart != null)
+                            pos = sitPart.GetWorldPosition() + pos * sitPart.GetWorldRotation();
+                        res.Add(new LSL_Vector(pos.X,pos.Y,pos.Z));
+                        break;
+                    case (int)ScriptBaseClass.PRIM_SIZE:
+                        // as in llGetAgentSize above
+                        res.Add(new LSL_Vector(0.45f, 0.6f, avatar.Appearance.AvatarHeight));
+                        break;
+                    case (int)ScriptBaseClass.PRIM_ROTATION:
+                        Quaternion rot = avatar.Rotation;
+                        if (sitPart != null)
+                        {
+                            rot = sitPart.GetWorldRotation() * rot; // apply sit part world rotation
+                        }
+                        res.Add(new LSL_Rotation (rot.X, rot.Y, rot.Z, rot.W));
+                        break;
+                    case (int)ScriptBaseClass.PRIM_TYPE:
+                        res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TYPE_BOX));
+                        res.Add(new LSL_Integer(ScriptBaseClass.PRIM_HOLE_DEFAULT));
+                        res.Add(new LSL_Vector(0f,1.0f,0f));
+                        res.Add(new LSL_Float(0.0f));
+                        res.Add(new LSL_Vector(0, 0, 0));
+                        res.Add(new LSL_Vector(1.0f,1.0f,0f));
+                        res.Add(new LSL_Vector(0, 0, 0));
+                        break;
+                    case (int)ScriptBaseClass.PRIM_TEXTURE:
+                        if (remain < 1)
+                            return null;
+                        int face = (int)rules.GetLSLIntegerItem(idx++);
+                        if (face == ScriptBaseClass.ALL_SIDES)
+                        {
+                            for (face = 0; face < 21; face++)
+                            {
+                                res.Add(new LSL_String(""));
+                                res.Add(new LSL_Vector(0,0,0));
+                                res.Add(new LSL_Vector(0,0,0));
+                                res.Add(new LSL_Float(0.0));
+                            }
+                        }
+                        else
+                        {
+                            if (face >= 0 && face < 21)
+                            {
+                                res.Add(new LSL_String(""));
+                                res.Add(new LSL_Vector(0,0,0));
+                                res.Add(new LSL_Vector(0,0,0));
+                                res.Add(new LSL_Float(0.0));
+                            }
+                        }
+                        break;
+                    case (int)ScriptBaseClass.PRIM_COLOR:
+                        if (remain < 1)
+                            return null;
+                        face = (int)rules.GetLSLIntegerItem(idx++);
+                        if (face == ScriptBaseClass.ALL_SIDES)
+                        {
+                            for (face = 0; face < 21; face++)
+                            {
+                                res.Add(new LSL_Vector(0,0,0));
+                                res.Add(new LSL_Float(0));
+                            }
+                        }
+                        else
+                        {
+                                res.Add(new LSL_Vector(0,0,0));
+                                res.Add(new LSL_Float(0));
+                        }
+                        break;
+                    case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
+                        if (remain < 1)
+                            return null;
+                        face = (int)rules.GetLSLIntegerItem(idx++);
+                        if (face == ScriptBaseClass.ALL_SIDES)
+                        {
+                            for (face = 0; face < 21; face++)
+                            {
+                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_SHINY_NONE));
+                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_BUMP_NONE));
+                            }
+                        }
+                        else
+                        {
+                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_SHINY_NONE));
+                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_BUMP_NONE));
+                        }
+                        break;
+                    case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
+                        if (remain < 1)
+                            return null;
+                        face = (int)rules.GetLSLIntegerItem(idx++);
+                        if (face == ScriptBaseClass.ALL_SIDES)
+                        {
+                            for (face = 0; face < 21; face++)
+                            {
+                                res.Add(new LSL_Integer(ScriptBaseClass.FALSE));
+                            }
+                        }
+                        else
+                        {
+                                res.Add(new LSL_Integer(ScriptBaseClass.FALSE));
+                        }
+                        break;
+                    case (int)ScriptBaseClass.PRIM_FLEXIBLE:
+                        res.Add(new LSL_Integer(0));
+                        res.Add(new LSL_Integer(0));// softness
+                        res.Add(new LSL_Float(0.0f));   // gravity
+                        res.Add(new LSL_Float(0.0f));      // friction
+                        res.Add(new LSL_Float(0.0f));      // wind
+                        res.Add(new LSL_Float(0.0f));   // tension
+                        res.Add(new LSL_Vector(0f,0f,0f));
+                        break;
+                    case (int)ScriptBaseClass.PRIM_TEXGEN:
+                        // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
+                        if (remain < 1)
+                            return null;
+                        face = (int)rules.GetLSLIntegerItem(idx++);
+                        if (face == ScriptBaseClass.ALL_SIDES)
+                        {
+                            for (face = 0; face < 21; face++)
+                            {
+                                    res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
+                            }
+                        }
+                        else
+                        {
+                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
+                        }
+                        break;
+                    case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
+                        res.Add(new LSL_Integer(0));
+                        res.Add(new LSL_Vector(0f,0f,0f));
+                        res.Add(new LSL_Float(0f)); // intensity
+                        res.Add(new LSL_Float(0f));    // radius
+                        res.Add(new LSL_Float(0f));   // falloff
+                        break;
+                    case (int)ScriptBaseClass.PRIM_GLOW:
+                        if (remain < 1)
+                            return null;
+                        face = (int)rules.GetLSLIntegerItem(idx++);
+                        if (face == ScriptBaseClass.ALL_SIDES)
+                        {
+                            for (face = 0; face < 21; face++)
+                            {
+                                res.Add(new LSL_Float(0f));
+                            }
+                        }
+                        else
+                        {
+                                res.Add(new LSL_Float(0f));
+                        }
+                        break;
+                    case (int)ScriptBaseClass.PRIM_TEXT:
+                        res.Add(new LSL_String(""));
+                        res.Add(new LSL_Vector(0f,0f,0f));
+                        res.Add(new LSL_Float(1.0f));
+                        break;
+                    case (int)ScriptBaseClass.PRIM_NAME:
+                        res.Add(new LSL_String(avatar.Name));
+                        break;
+                    case (int)ScriptBaseClass.PRIM_DESC:
+                        res.Add(new LSL_String(""));
+                        break;
+                    case (int)ScriptBaseClass.PRIM_ROT_LOCAL:                      
+                        Quaternion lrot = avatar.Rotation;
+                        if (sitPart != null && sitPart != sitPart.ParentGroup.RootPart)
+                        {
+                            lrot = sitPart.RotationOffset * lrot; // apply sit part rotation offset
+                        }
+                        res.Add(new LSL_Rotation(lrot.X, lrot.Y, lrot.Z, lrot.W));
+                        break;
+                    case (int)ScriptBaseClass.PRIM_POS_LOCAL:
+                        Vector3 lpos = avatar.OffsetPosition; // pos relative to sit part
+                        Vector3 lsitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f * 2.0f);
+                        lpos -= lsitOffset;
+                        if (sitPart != null && sitPart != sitPart.ParentGroup.RootPart)
+                        {
+                            lpos = sitPart.OffsetPosition + (lpos * sitPart.RotationOffset); // make it relative to root prim
+                        }
+                        res.Add(new LSL_Vector(lpos.X,lpos.Y,lpos.Z));
+                        break;
+                    case (int)ScriptBaseClass.PRIM_LINK_TARGET:
+                        if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
+                            return null;
+                        return rules.GetSublist(idx, -1);
+                }
+            }
+            return null;
+        }
    }
    public class NotecardCache
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 795de80..ceb4660 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    case (int)ScriptBaseClass.WL_CLOUD_DETAIL_XY_DENSITY:
                        idx++;
                        iV = rules.GetVector3Item(idx);
-                        wl.cloudDetailXYDensity = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);
+                        wl.cloudDetailXYDensity = iV;
                        break;
                    case (int)ScriptBaseClass.WL_CLOUD_SCALE:
                        idx++;
@@ -329,7 +329,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    case (int)ScriptBaseClass.WL_CLOUD_XY_DENSITY:
                        idx++;
                        iV = rules.GetVector3Item(idx);
-                        wl.cloudXYDensity = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);
+                        wl.cloudXYDensity = iV;
                        break;
                    case (int)ScriptBaseClass.WL_DENSITY_MULTIPLIER:
                        idx++;
@@ -384,7 +384,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    case (int)ScriptBaseClass.WL_REFLECTION_WAVELET_SCALE:
                        idx++;
                        iV = rules.GetVector3Item(idx);
-                        wl.reflectionWaveletScale = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);
+                        wl.reflectionWaveletScale = iV;
                        break;
                    case (int)ScriptBaseClass.WL_REFRACT_SCALE_ABOVE:
                        idx++;
@@ -422,7 +422,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    case (int)ScriptBaseClass.WL_WATER_COLOR:
                        idx++;
                        iV = rules.GetVector3Item(idx);
-                        wl.waterColor = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);
+                        wl.waterColor = iV;
                        break;
                    case (int)ScriptBaseClass.WL_WATER_FOG_DENSITY_EXPONENT:
                        idx++;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
index 7844c75..84cf6ca 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
@@ -333,8 +333,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            {
                if (type == typeof(OpenMetaverse.Quaternion))
                {
-                    LSL_Rotation rot = (LSL_Rotation)lslparm;
+                    return (OpenMetaverse.Quaternion)((LSL_Rotation)lslparm);
-                    return new OpenMetaverse.Quaternion((float)rot.x,(float)rot.y,(float)rot.z,(float)rot.s);
                }
            }
@@ -343,8 +342,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            {
                if (type == typeof(OpenMetaverse.Vector3))
                {
-                    LSL_Vector vect = (LSL_Vector)lslparm;
+                    return (OpenMetaverse.Vector3)((LSL_Vector)lslparm);
-                    return new OpenMetaverse.Vector3((float)vect.x,(float)vect.y,(float)vect.z);
                }
            }
@@ -367,13 +365,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                            result[i] = new UUID((LSL_Key)plist[i]);
                        else if (plist[i] is LSL_Rotation)
                        {
-                            LSL_Rotation rot = (LSL_Rotation)plist[i];
+                            result[i] = (OpenMetaverse.Quaternion)(
-                            result[i] = new OpenMetaverse.Quaternion((float)rot.x,(float)rot.y,(float)rot.z,(float)rot.s);
+                                (LSL_Rotation)plist[i]);
                        }
                        else if (plist[i] is LSL_Vector)
                        {
-                            LSL_Vector vect = (LSL_Vector)plist[i];
+                            result[i] = (OpenMetaverse.Vector3)(
-                            result[i] = new OpenMetaverse.Vector3((float)vect.x,(float)vect.y,(float)vect.z);
+                                (LSL_Vector)plist[i]);
                        }
                        else
                            MODError("unknown LSL list element type");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 2f02f1f..ceff889 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -782,10 +782,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                        // We will launch the teleport on a new thread so that when the script threads are terminated
                        // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.                        
-                        Util.FireAndForget(
+                        Util.FireAndForget(o => World.RequestTeleportLocation(
-                            o => World.RequestTeleportLocation(presence.ControllingClient, regionName,
+                            presence.ControllingClient, regionName, position,
-                                new Vector3((float)position.x, (float)position.y, (float)position.z),
+                            lookat, (uint)TPFlags.ViaLocation));
-                                new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation));
                        ScriptSleep(5000);
@@ -828,10 +827,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                        // We will launch the teleport on a new thread so that when the script threads are terminated
                        // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.
-                        Util.FireAndForget(
+                        Util.FireAndForget(o => World.RequestTeleportLocation(
-                            o => World.RequestTeleportLocation(presence.ControllingClient, regionHandle,
+                            presence.ControllingClient, regionHandle, 
-                                new Vector3((float)position.x, (float)position.y, (float)position.z),
+                            position, lookat, (uint)TPFlags.ViaLocation));
-                                new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation));
                        ScriptSleep(5000);
@@ -2259,11 +2257,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            CheckThreatLevel(ThreatLevel.High, "osGetLinkPrimitiveParams");
            m_host.AddScriptLPS(1);
            InitLSL();
+            // One needs to cast m_LSL_Api because we're using functions not
+            // on the ILSL_Api interface.
+            LSL_Api LSL_Api = (LSL_Api)m_LSL_Api;
            LSL_List retVal = new LSL_List();
-            List<SceneObjectPart> parts = ((LSL_Api)m_LSL_Api).GetLinkParts(linknumber);
+            LSL_List remaining = null;
+            List<SceneObjectPart> parts = LSL_Api.GetLinkParts(linknumber);
            foreach (SceneObjectPart part in parts)
            {
-                retVal += ((LSL_Api)m_LSL_Api).GetLinkPrimitiveParams(part, rules);
+                remaining = LSL_Api.GetPrimParams(part, rules, ref retVal);
+            }
+            while (remaining != null && remaining.Length > 2)
+            {
+                linknumber = remaining.GetLSLIntegerItem(0);
+                rules = remaining.GetSublist(1, -1);
+                parts = LSL_Api.GetLinkParts(linknumber);
+                foreach (SceneObjectPart part in parts)
+                    remaining = LSL_Api.GetPrimParams(part, rules, ref retVal);
            }
            return retVal;
        }
@@ -2355,7 +2367,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    ownerID = m_host.OwnerID;
                UUID x = module.CreateNPC(firstname,
                                          lastname,
-                                          new Vector3((float) position.x, (float) position.y, (float) position.z),
+                                          position,
                                          ownerID,
                                          senseAsAgent,
                                          World,
@@ -2478,7 +2490,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            return new LSL_Vector(0, 0, 0);
        }
-        public void osNpcMoveTo(LSL_Key npc, LSL_Vector position)
+        public void osNpcMoveTo(LSL_Key npc, LSL_Vector pos)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcMoveTo");
            m_host.AddScriptLPS(1);
@@ -2493,7 +2505,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                if (!module.CheckPermissions(npcId, m_host.OwnerID))
                    return;
                
-                Vector3 pos = new Vector3((float) position.x, (float) position.y, (float) position.z);
                module.MoveToTarget(npcId, World, pos, false, true, false);
            }
        }
@@ -2513,11 +2524,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                if (!module.CheckPermissions(npcId, m_host.OwnerID))
                    return;
-                Vector3 pos = new Vector3((float)target.x, (float)target.y, (float)target.z);
                module.MoveToTarget(
                    new UUID(npc.m_string),
                    World,
-                    pos,
+                    target,
                    (options & ScriptBaseClass.OS_NPC_NO_FLY) != 0,
                    (options & ScriptBaseClass.OS_NPC_LAND_AT_TARGET) != 0,
                    (options & ScriptBaseClass.OS_NPC_RUNNING) != 0);
@@ -2569,7 +2579,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                ScenePresence sp = World.GetScenePresence(npcId);
                if (sp != null)
-                    sp.Rotation = LSL_Api.Rot2Quaternion(rotation);
+                    sp.Rotation = rotation;
            }
        }
@@ -2929,7 +2939,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                avatar.SpeedModifier = (float)SpeedModifier;
        }
        
-        public void osKickAvatar(string FirstName,string SurName,string alert)
+        public void osKickAvatar(string FirstName, string SurName, string alert)
        {
            CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar");
            m_host.AddScriptLPS(1);
@@ -2943,10 +2953,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                        sp.ControllingClient.Kick(alert);
                    // ...and close on our side
-                    sp.Scene.IncomingCloseAgent(sp.UUID);
+                    sp.Scene.IncomingCloseAgent(sp.UUID, false);
                }
            });
        }
+        public LSL_Float osGetHealth(string avatar)
+        {
+            CheckThreatLevel(ThreatLevel.None, "osGetHealth");
+            m_host.AddScriptLPS(1);
+            LSL_Float health = new LSL_Float(-1);
+            ScenePresence presence = World.GetScenePresence(new UUID(avatar));
+            if (presence != null) health = presence.Health;
+            return health;
+        }
        
        public void osCauseDamage(string avatar, double damage)
        {
@@ -3006,7 +3027,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            m_host.AddScriptLPS(1);
            InitLSL();
            
-            return m_LSL_Api.GetLinkPrimitiveParamsEx(prim, rules);
+            return m_LSL_Api.GetPrimitiveParamsEx(prim, rules);
        }
        public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules)
@@ -3015,7 +3036,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            m_host.AddScriptLPS(1);
            InitLSL();
            
-            m_LSL_Api.SetPrimitiveParamsEx(prim, rules);
+            m_LSL_Api.SetPrimitiveParamsEx(prim, rules, "osSetPrimitiveParams");
        }
        
        /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 678f9d5..4dd795d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -352,7 +352,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                q = avatar.Rotation;
            }
-            LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
+            LSL_Types.Quaternion r = new LSL_Types.Quaternion(q);
            LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r);
            double mag_fwd = LSL_Types.Vector3.Mag(forward_dir);
@@ -429,9 +429,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                            try
                            {
                                Vector3 diff = toRegionPos - fromRegionPos;
-                                LSL_Types.Vector3 obj_dir = new LSL_Types.Vector3(diff.X, diff.Y, diff.Z);
+                                double dot = LSL_Types.Vector3.Dot(forward_dir, diff);
-                                double dot = LSL_Types.Vector3.Dot(forward_dir, obj_dir);
+                                double mag_obj = LSL_Types.Vector3.Mag(diff);
-                                double mag_obj = LSL_Types.Vector3.Mag(obj_dir);
                                ang_obj = Math.Acos(dot / (mag_fwd * mag_obj));
                            }
                            catch
@@ -483,7 +482,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                q = avatar.Rotation;
            }
-            LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
+            LSL_Types.Quaternion r = new LSL_Types.Quaternion(q);
            LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r);
            double mag_fwd = LSL_Types.Vector3.Mag(forward_dir);
            bool attached = (SensePoint.ParentGroup.AttachmentPoint != 0);
@@ -564,8 +563,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                        double ang_obj = 0;
                        try
                        {
-                            Vector3 diff = toRegionPos - fromRegionPos;
+                            LSL_Types.Vector3 obj_dir = new LSL_Types.Vector3(
-                            LSL_Types.Vector3 obj_dir = new LSL_Types.Vector3(diff.X, diff.Y, diff.Z);
+                                toRegionPos - fromRegionPos);
                            double dot = LSL_Types.Vector3.Dot(forward_dir, obj_dir);
                            double mag_obj = LSL_Types.Vector3.Mag(obj_dir);
                            ang_obj = Math.Acos(dot / (mag_fwd * mag_obj));
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index af35258..05c20f9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -429,8 +429,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
       LSL_Integer llGetLinkNumberOfSides(LSL_Integer link);
              void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density);
-              void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
+              void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc);
-          LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
              void llSetKeyframedMotion(LSL_List frames, LSL_List options);
+          LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
    }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 8c34ed3..d0e041c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -40,16 +40,75 @@ using LSL_Key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
 namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
 {
+    /// <summary>
+    /// To permit region owners to enable the extended scripting functionality
+    /// of OSSL, without allowing malicious scripts to access potentially
+    /// troublesome functions, each OSSL function is assigned a threat level,
+    /// and access to the functions is granted or denied based on a default
+    /// threshold set in OpenSim.ini (which can be overridden for individual
+    /// functions on a case-by-case basis)
+    /// </summary>
    public enum ThreatLevel
    {
+        // Not documented, presumably means permanently disabled ?
        NoAccess = -1,
+        /// <summary>
+        /// Function is no threat at all. It doesn't constitute a threat to 
+        /// either users or the system and has no known side effects.
+        /// </summary>
        None = 0,
+        /// <summary>
+        /// Abuse of this command can cause a nuisance to the region operator,
+        /// such as log message spew.
+        /// </summary>
        Nuisance = 1,
+        /// <summary>
+        /// Extreme levels of abuse of this function can cause impaired 
+        /// functioning of the region, or very gullible users can be tricked
+        /// into experiencing harmless effects.
+        /// </summary>
        VeryLow = 2,
+        /// <summary>
+        /// Intentional abuse can cause crashes or malfunction under certain
+        /// circumstances, which can be easily rectified; or certain users can
+        /// be tricked into certain situations in an avoidable manner.
+        /// </summary>
        Low = 3,
+        /// <summary>
+        /// Intentional abuse can cause denial of service and crashes with
+        /// potential of data or state loss; or trusting users can be tricked 
+        /// into embarrassing or uncomfortable situations.
+        /// </summary>
        Moderate = 4,
+        /// <summary>
+        /// Casual abuse can cause impaired functionality or temporary denial
+        /// of service conditions. Intentional abuse can easily cause crashes
+        /// with potential data loss, or can be used to trick experienced and
+        /// cautious users into unwanted situations, or changes global data
+        /// permanently and without undo ability.
+        /// </summary>
        High = 5,
+        /// <summary>
+        /// Even normal use may, depending on the number of instances, or
+        /// frequency of use, result in severe service impairment or crash
+        /// with loss of data, or can be used to cause unwanted or harmful
+        /// effects on users without giving the user a means to avoid it.
+        /// </summary>
        VeryHigh = 6,
+        /// <summary>
+        /// Even casual use is a danger to region stability, or function allows
+        /// console or OS command execution, or function allows taking money
+        /// without consent, or allows deletion or modification of user data,
+        /// or allows the compromise of sensitive data by design.
+        /// </summary>
        Severe = 7
    };
@@ -258,6 +317,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
        int osGetSimulatorMemory();
        void osKickAvatar(string FirstName,string SurName,string alert);
        void osSetSpeed(string UUID, LSL_Float SpeedModifier);
+        LSL_Float osGetHealth(string avatar);
        void osCauseHealing(string avatar, double healing);
        void osCauseDamage(string avatar, double damage);
        LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index f989cc6..05ba222 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -329,6 +329,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
        public const int PRIM_OMEGA = 32;
        public const int PRIM_POS_LOCAL = 33;
        public const int PRIM_LINK_TARGET = 34;
+        public const int PRIM_SLICE = 35;
        public const int PRIM_TEXGEN_DEFAULT = 0;
        public const int PRIM_TEXGEN_PLANAR = 1;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 94405d2..e9131e4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -865,7 +865,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
        {
            m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier);
        }
-        
+        public LSL_Float osGetHealth(string avatar)
+        {
+            return m_OSSL_Functions.osGetHealth(avatar);
+        }
        public void osCauseDamage(string avatar, double damage)
        {
            m_OSSL_Functions.osCauseDamage(avatar, damage);
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 17a0d69..03be2ab 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -546,6 +546,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                    "OpenSim.Region.ScriptEngine.Shared.dll"));
            parameters.ReferencedAssemblies.Add(Path.Combine(rootPath,
                    "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll"));
+            parameters.ReferencedAssemblies.Add(Path.Combine(rootPath,
+                    "OpenMetaverseTypes.dll"));
            if (lang == enumCompileType.yp)
            {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index 9e5fb24..22804f5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -164,11 +164,11 @@ namespace OpenSim.Region.ScriptEngine.Shared
                else
                {
                    // Set the values from the touch data provided by the client
-                    touchST = new LSL_Types.Vector3(value.STCoord.X, value.STCoord.Y, value.STCoord.Z);
+                    touchST = new LSL_Types.Vector3(value.STCoord);
-                    touchUV = new LSL_Types.Vector3(value.UVCoord.X, value.UVCoord.Y, value.UVCoord.Z);
+                    touchUV = new LSL_Types.Vector3(value.UVCoord);
-                    touchNormal = new LSL_Types.Vector3(value.Normal.X, value.Normal.Y, value.Normal.Z);
+                    touchNormal = new LSL_Types.Vector3(value.Normal);
-                    touchBinormal = new LSL_Types.Vector3(value.Binormal.X, value.Binormal.Y, value.Binormal.Z);
+                    touchBinormal = new LSL_Types.Vector3(value.Binormal);
-                    touchPos = new LSL_Types.Vector3(value.Position.X, value.Position.Y, value.Position.Z);
+                    touchPos = new LSL_Types.Vector3(value.Position);
                    touchFace = value.FaceIndex;
                }
            }
@@ -189,19 +189,13 @@ namespace OpenSim.Region.ScriptEngine.Shared
                    Country = account.UserCountry;
                Owner = Key;
-                Position = new LSL_Types.Vector3(
+                Position = new LSL_Types.Vector3(presence.AbsolutePosition);
-                        presence.AbsolutePosition.X,
-                        presence.AbsolutePosition.Y,
-                        presence.AbsolutePosition.Z);
                Rotation = new LSL_Types.Quaternion(
                        presence.Rotation.X,
                        presence.Rotation.Y,
                        presence.Rotation.Z,
                        presence.Rotation.W);
-                Velocity = new LSL_Types.Vector3(
+                Velocity = new LSL_Types.Vector3(presence.Velocity);
-                        presence.Velocity.X,
-                        presence.Velocity.Y,
-                        presence.Velocity.Z);
                Type = 0x01; // Avatar
                if (presence.PresenceType == PresenceType.Npc)
@@ -254,16 +248,12 @@ namespace OpenSim.Region.ScriptEngine.Shared
                }
            }
-            Position = new LSL_Types.Vector3(part.AbsolutePosition.X,
+            Position = new LSL_Types.Vector3(part.AbsolutePosition);
-                                             part.AbsolutePosition.Y,
-                                             part.AbsolutePosition.Z);
            Quaternion wr = part.ParentGroup.GroupRotation;
            Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W);
-            Velocity = new LSL_Types.Vector3(part.Velocity.X,
+            Velocity = new LSL_Types.Vector3(part.Velocity);
-                                             part.Velocity.Y,
-                                             part.Velocity.Z);
        }
    }
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 8adf4c5..c9c4753 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -31,6 +31,11 @@ using System.Globalization;
 using System.Text.RegularExpressions;
 using OpenSim.Framework;
+using OpenMetaverse;
+using OMV_Vector3 = OpenMetaverse.Vector3;
+using OMV_Vector3d = OpenMetaverse.Vector3d;
+using OMV_Quaternion = OpenMetaverse.Quaternion;
 namespace OpenSim.Region.ScriptEngine.Shared
 {
    [Serializable]
@@ -54,6 +59,20 @@ namespace OpenSim.Region.ScriptEngine.Shared
                z = (float)vector.z;
            }
+            public Vector3(OMV_Vector3 vector)
+            {
+                x = vector.X;
+                y = vector.Y;
+                z = vector.Z;
+            }
+            public Vector3(OMV_Vector3d vector)
+            {
+                x = vector.X;
+                y = vector.Y;
+                z = vector.Z;
+            }
            public Vector3(double X, double Y, double Z)
            {
                x = X;
@@ -109,6 +128,26 @@ namespace OpenSim.Region.ScriptEngine.Shared
                return new list(new object[] { vec });
            }
+            public static implicit operator OMV_Vector3(Vector3 vec)
+            {
+                return new OMV_Vector3((float)vec.x, (float)vec.y, (float)vec.z);
+            }
+            public static implicit operator Vector3(OMV_Vector3 vec)
+            {
+                return new Vector3(vec);
+            }
+            public static implicit operator OMV_Vector3d(Vector3 vec)
+            {
+                return new OMV_Vector3d(vec.x, vec.y, vec.z);
+            }
+            public static implicit operator Vector3(OMV_Vector3d vec)
+            {
+                return new Vector3(vec);
+            }
            public static bool operator ==(Vector3 lhs, Vector3 rhs)
            {
                return (lhs.x == rhs.x && lhs.y == rhs.y && lhs.z == rhs.z);
@@ -322,6 +361,14 @@ namespace OpenSim.Region.ScriptEngine.Shared
                    s = 1;
            }
+            public Quaternion(OMV_Quaternion rot)
+            {
+                x = rot.X;
+                y = rot.Y;
+                z = rot.Z;
+                s = rot.W;
+            }
            #endregion
            #region Overriders
@@ -368,6 +415,21 @@ namespace OpenSim.Region.ScriptEngine.Shared
                return new list(new object[] { r });
            }
+            public static implicit operator OMV_Quaternion(Quaternion rot)
+            {
+                // LSL quaternions can normalize to 0, normal Quaternions can't.
+                if (rot.s == 0 && rot.x == 0 && rot.y == 0 && rot.z == 0)
+                    rot.z = 1; // ZERO_ROTATION = 0,0,0,1
+                OMV_Quaternion omvrot = new OMV_Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s);
+                omvrot.Normalize();
+                return omvrot;
+            }
+            public static implicit operator Quaternion(OMV_Quaternion rot)
+            {
+                return new Quaternion(rot);
+            }
            public static bool operator ==(Quaternion lhs, Quaternion rhs)
            {
                // Return true if the fields match:
@@ -562,12 +624,23 @@ namespace OpenSim.Region.ScriptEngine.Shared
                else if (m_data[itemIndex] is LSL_Types.LSLString)
                    return new LSLInteger(m_data[itemIndex].ToString());
                else
-                    throw new InvalidCastException();
+                    throw new InvalidCastException(string.Format(
+                        "{0} expected but {1} given",
+                        typeof(LSL_Types.LSLInteger).Name,
+                        m_data[itemIndex] != null ?
+                        m_data[itemIndex].GetType().Name : "null"));
            }
            public LSL_Types.Vector3 GetVector3Item(int itemIndex)
            {
-              return (LSL_Types.Vector3)m_data[itemIndex];
+                if(m_data[itemIndex] is LSL_Types.Vector3)
+                    return (LSL_Types.Vector3)m_data[itemIndex];
+                else
+                    throw new InvalidCastException(string.Format(
+                        "{0} expected but {1} given",
+                        typeof(LSL_Types.Vector3).Name,
+                        m_data[itemIndex] != null ?
+                        m_data[itemIndex].GetType().Name : "null"));
            }
            public LSL_Types.Quaternion GetQuaternionItem(int itemIndex)
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 5c4174e..cee10df 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -152,9 +152,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            det[0] = new DetectParams();
            det[0].Key = remoteClient.AgentId;
            det[0].Populate(myScriptEngine.World);
-            det[0].OffsetPos = new LSL_Types.Vector3(offsetPos.X,
+            det[0].OffsetPos = offsetPos;
-                                                     offsetPos.Y,
-                                                     offsetPos.Z);
            if (originalID == 0)
            {
@@ -298,9 +296,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            foreach (DetectedObject detobj in col.Colliders)
            {
                DetectParams d = new DetectParams();
-                d.Position = new LSL_Types.Vector3(detobj.posVector.X,
+                d.Position = detobj.posVector;
-                    detobj.posVector.Y,
-                    detobj.posVector.Z);
                d.Populate(myScriptEngine.World);
                det.Add(d);
                myScriptEngine.PostObjectEvent(localID, new EventParams(
@@ -318,9 +314,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            foreach (DetectedObject detobj in col.Colliders)
            {
                DetectParams d = new DetectParams();
-                d.Position = new LSL_Types.Vector3(detobj.posVector.X,
+                d.Position = detobj.posVector;
-                    detobj.posVector.Y,
-                    detobj.posVector.Z);
                d.Populate(myScriptEngine.World);
                det.Add(d);
                myScriptEngine.PostObjectEvent(localID, new EventParams(
@@ -337,9 +331,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            foreach (DetectedObject detobj in col.Colliders)
            {
                DetectParams d = new DetectParams();
-                d.Position = new LSL_Types.Vector3(detobj.posVector.X,
+                d.Position = detobj.posVector;
-                    detobj.posVector.Y,
-                    detobj.posVector.Z);
                d.Populate(myScriptEngine.World);
                det.Add(d);
                myScriptEngine.PostObjectEvent(localID, new EventParams(
@@ -381,8 +373,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            myScriptEngine.PostObjectEvent(localID, new EventParams(
                    "at_target", new object[] {
                    new LSL_Types.LSLInteger(handle),
-                    new LSL_Types.Vector3(targetpos.X,targetpos.Y,targetpos.Z),
+                    new LSL_Types.Vector3(targetpos),
-                    new LSL_Types.Vector3(atpos.X,atpos.Y,atpos.Z) },
+                    new LSL_Types.Vector3(atpos) },
                    new DetectParams[0]));
        }
@@ -399,8 +391,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            myScriptEngine.PostObjectEvent(localID, new EventParams(
                    "at_rot_target", new object[] {
                    new LSL_Types.LSLInteger(handle),
-                    new LSL_Types.Quaternion(targetrot.X,targetrot.Y,targetrot.Z,targetrot.W),
+                    new LSL_Types.Quaternion(targetrot),
-                    new LSL_Types.Quaternion(atrot.X,atrot.Y,atrot.Z,atrot.W) },
+                    new LSL_Types.Quaternion(atrot) },
                    new DetectParams[0]));
        }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index f6cb7df..9f05666 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -656,7 +656,19 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                if (m_Assemblies.ContainsKey(instance.AssetID))
                {
                    string assembly = m_Assemblies[instance.AssetID];
-                    instance.SaveState(assembly);
+                    try
+                    {
+                        instance.SaveState(assembly);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error(
+                            string.Format(
+                                "[XEngine]: Failed final state save for script {0}.{1}, item UUID {2}, prim UUID {3} in {4}.  Exception ",
+                                instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, World.Name)
+                            , e);
+                    }
                }
                // Clear the event queue and abort the instance thread
@@ -778,7 +790,18 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                    assembly = m_Assemblies[i.AssetID];
                
-                i.SaveState(assembly);
+                try
+                {
+                    i.SaveState(assembly);
+                }
+                catch (Exception e)
+                {
+                    m_log.Error(
+                        string.Format(
+                            "[XEngine]: Failed to save state of script {0}.{1}, item UUID {2}, prim UUID {3} in {4}.  Exception ",
+                            i.PrimName, i.ScriptName, i.ItemID, i.ObjectID, World.Name)
+                        , e);
+                }
            }
            instances.Clear();
@@ -971,6 +994,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                // This delay exists to stop mono problems where script compilation and startup would stop the sim
                // working properly for the session.
                System.Threading.Thread.Sleep(m_StartDelay);
+                m_log.InfoFormat("[XEngine]: Performing initial script startup on {0}", m_Scene.Name);
            }
            object[] o;
@@ -986,13 +1011,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                    if (m_InitialStartup)
                        if (scriptsStarted % 50 == 0)
                            m_log.InfoFormat(
-                                "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.RegionInfo.RegionName);
+                                "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.Name);
                }
            }
            if (m_InitialStartup)
                m_log.InfoFormat(
-                    "[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.RegionInfo.RegionName);
+                    "[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.Name);
            // NOTE: Despite having a lockless queue, this lock is required
            // to make sure there is never no compile thread while there
@@ -1053,10 +1078,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                return false;
            }
-            UUID assetID = item.AssetID;
+            m_log.DebugFormat(
+                "[XEngine] Loading script {0}.{1}, item UUID {2}, prim UUID {3} @ {4}.{5}",
+                part.ParentGroup.RootPart.Name, item.Name, itemID, part.UUID,
+                part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
-            //m_log.DebugFormat("[XEngine] Compiling script {0} ({1} on object {2})",
+            UUID assetID = item.AssetID;
-            //        item.Name, itemID.ToString(), part.ParentGroup.RootPart.Name);
            ScenePresence presence = m_Scene.GetScenePresence(item.OwnerID);
@@ -1235,10 +1262,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                                              item.Name, startParam, postOnRez,
                                              stateSource, m_MaxScriptQueue);
-                m_log.DebugFormat(
+//                m_log.DebugFormat(
-                        "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}",
+//                        "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}",
-                        part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, 
+//                        part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, 
-                        part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
+//                        part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
                if (presence != null)
                {
@@ -1554,9 +1581,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                else if (p[i] is string)
                    lsl_p[i] = new LSL_Types.LSLString((string)p[i]);
                else if (p[i] is Vector3)
-                    lsl_p[i] = new LSL_Types.Vector3(((Vector3)p[i]).X, ((Vector3)p[i]).Y, ((Vector3)p[i]).Z);
+                    lsl_p[i] = new LSL_Types.Vector3((Vector3)p[i]);
                else if (p[i] is Quaternion)
-                    lsl_p[i] = new LSL_Types.Quaternion(((Quaternion)p[i]).X, ((Quaternion)p[i]).Y, ((Quaternion)p[i]).Z, ((Quaternion)p[i]).W);
+                    lsl_p[i] = new LSL_Types.Quaternion((Quaternion)p[i]);
                else if (p[i] is float)
                    lsl_p[i] = new LSL_Types.LSLFloat((float)p[i]);
                else
@@ -1580,9 +1607,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                else if (p[i] is string)
                    lsl_p[i] = new LSL_Types.LSLString((string)p[i]);
                else if (p[i] is Vector3)
-                    lsl_p[i] = new LSL_Types.Vector3(((Vector3)p[i]).X, ((Vector3)p[i]).Y, ((Vector3)p[i]).Z);
+                    lsl_p[i] = new LSL_Types.Vector3((Vector3)p[i]);
                else if (p[i] is Quaternion)
-                    lsl_p[i] = new LSL_Types.Quaternion(((Quaternion)p[i]).X, ((Quaternion)p[i]).Y, ((Quaternion)p[i]).Z, ((Quaternion)p[i]).W);
+                    lsl_p[i] = new LSL_Types.Quaternion((Quaternion)p[i]);
                else if (p[i] is float)
                    lsl_p[i] = new LSL_Types.LSLFloat((float)p[i]);
                else