42 files changed, 2334 insertions, 2090 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index 414b9bf..87ded7b 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -220,7 +220,7 @@ namespace OpenSim.Region.ClientStack.Linden
            PollServiceMeshEventArgs args;
            if (m_pollservices.TryGetValue(user, out args))
            {
-                args.UpdateThrottle(imagethrottle, p);
+                args.UpdateThrottle(imagethrottle);
            }
        }
@@ -238,14 +238,13 @@ namespace OpenSim.Region.ClientStack.Linden
                base(null, uri, null, null, null, null, pId, int.MaxValue)
            {
                m_scene = scene;
-                m_throttler = new MeshCapsDataThrottler(100000, 1400000, 10000, scene, pId);
+                m_throttler = new MeshCapsDataThrottler(100000);
                // x is request id, y is userid
                HasEvents = (x, y) =>
                {
                    lock (responses)
                    {
                        bool ret = m_throttler.hasEvents(x, responses);
-                        m_throttler.ProcessTime();
                        return ret;
                    }
@@ -271,8 +270,8 @@ namespace OpenSim.Region.ClientStack.Linden
                        }
                        finally
                        {
-                            m_throttler.ProcessTime();
                            responses.Remove(x);
+                            m_throttler.PassTime();
                        }
                    }
                };
@@ -285,6 +284,7 @@ namespace OpenSim.Region.ClientStack.Linden
                    reqinfo.request = y;
                    m_queue.Enqueue(reqinfo);
+                    m_throttler.PassTime();
                };
                // this should never happen except possible on shutdown
@@ -364,12 +364,15 @@ namespace OpenSim.Region.ClientStack.Linden
                    };
                }
-                m_throttler.ProcessTime();
+                m_throttler.PassTime();
            }
-            internal void UpdateThrottle(int pimagethrottle, ScenePresence p)
+            internal void UpdateThrottle(int pthrottle)
            {
-                m_throttler.UpdateThrottle(pimagethrottle, p);
+                int tmp = 2 * pthrottle;
+                if(tmp < 10000)
+                    tmp = 10000;
+                m_throttler.ThrottleBytes = tmp;
            }
        }
@@ -423,24 +426,15 @@ namespace OpenSim.Region.ClientStack.Linden
        internal sealed class MeshCapsDataThrottler
        {
+            private double lastTimeElapsed = 0;
+            private double BytesSent = 0;
-            private volatile int currenttime = 0;
+            public MeshCapsDataThrottler(int pBytes)
-            private volatile int lastTimeElapsed = 0;
-            private volatile int BytesSent = 0;
-            private int CapSetThrottle = 0;
-            private readonly Scene m_scene;
-            private ThrottleOutPacketType Throttle;
-            private readonly UUID User;
-            public MeshCapsDataThrottler(int pBytes, int max, int min, Scene pScene, UUID puser)
            {
+                if(pBytes < 10000)
+                    pBytes = 10000;
                ThrottleBytes = pBytes;
-                if(ThrottleBytes < 10000)
+                lastTimeElapsed = Util.GetTimeStampMS();
-                    ThrottleBytes = 10000;
-                lastTimeElapsed = Util.EnvironmentTickCount();
-                Throttle = ThrottleOutPacketType.Asset;
-                m_scene = pScene;
-                User = puser;
            }
            public bool hasEvents(UUID key, Dictionary<UUID, aPollResponse> responses)
@@ -470,46 +464,22 @@ namespace OpenSim.Region.ClientStack.Linden
                return haskey;
            }
-            public void ProcessTime()
+            public void PassTime()
            {
-                PassTime();
+                double currenttime = Util.GetTimeStampMS();
-            }
+                double timeElapsed = currenttime - lastTimeElapsed;
+                if(timeElapsed < 50.0)
-            private void PassTime()
+                    return;
+                int add = (int)(ThrottleBytes * timeElapsed * 0.001);
+                if (add >= 1000)
            {
-                currenttime = Util.EnvironmentTickCount();
-                int timeElapsed = Util.EnvironmentTickCountSubtract(currenttime, lastTimeElapsed);
-                if (timeElapsed >= 100)
-                {
                    lastTimeElapsed = currenttime;
-                    BytesSent -= (ThrottleBytes * timeElapsed / 1000);
+                    BytesSent -= add;
                    if (BytesSent < 0) BytesSent = 0;
                }
            }
-            private void AlterThrottle(int setting, ScenePresence p)
+            public int ThrottleBytes;
-            {
-                p.ControllingClient.SetAgentThrottleSilent((int)Throttle,setting);
            }
-            public int ThrottleBytes
-            {
-                get { return CapSetThrottle; }
-                set
-                {
-                    if (value > 10000)
-                        CapSetThrottle = value;
-                    else
-                        CapSetThrottle = 10000;
                }
-            }
-            internal void UpdateThrottle(int pimagethrottle, ScenePresence p)
-            {
-                // Client set throttle !
-                CapSetThrottle = 2 * pimagethrottle;
-                ProcessTime();
-            }
-        }
-    }
 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 1a31157..d77cf0c 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -221,7 +221,7 @@ namespace OpenSim.Region.ClientStack.Linden
            private HashSet<UUID> dropedResponses = new HashSet<UUID>();
            private Scene m_scene;
-            private CapsDataThrottler m_throttler = new CapsDataThrottler(100000, 1400000,10000);
+            private CapsDataThrottler m_throttler = new CapsDataThrottler(100000);
            public PollServiceTextureEventArgs(UUID pId, Scene scene) :
                    base(null, "", null, null, null, null, pId, int.MaxValue)              
            {
@@ -232,7 +232,6 @@ namespace OpenSim.Region.ClientStack.Linden
                    lock (responses)
                    {
                        bool ret = m_throttler.hasEvents(x, responses);
-                        m_throttler.ProcessTime();
                        return ret;
                    }
@@ -258,6 +257,7 @@ namespace OpenSim.Region.ClientStack.Linden
                        finally
                        {
                            responses.Remove(x);
+                            m_throttler.PassTime();
                        }
                    }
                };
@@ -282,6 +282,7 @@ namespace OpenSim.Region.ClientStack.Linden
                        }
                    }
                    m_queue.Enqueue(reqinfo);
+                    m_throttler.PassTime();
                };
                // this should never happen except possible on shutdown
@@ -381,14 +382,15 @@ namespace OpenSim.Region.ClientStack.Linden
                            response = response
                        };
                } 
-                m_throttler.ProcessTime();
+                m_throttler.PassTime();
            }
            internal void UpdateThrottle(int pimagethrottle)
            {
-                m_throttler.ThrottleBytes = 2 * pimagethrottle;
+                int tmp = 2 * pimagethrottle;
-                if(m_throttler.ThrottleBytes < 10000)
+                if(tmp < 10000)
-                    m_throttler.ThrottleBytes = 10000;
+                    tmp = 10000;
+                m_throttler.ThrottleBytes = tmp;
            }
        }
@@ -456,15 +458,14 @@ namespace OpenSim.Region.ClientStack.Linden
        internal sealed class CapsDataThrottler
        {
-            private volatile int currenttime = 0;
+            private double lastTimeElapsed = 0;
-            private volatile int lastTimeElapsed = 0;
            private volatile int BytesSent = 0;
-            public CapsDataThrottler(int pBytes, int max, int min)
+            public CapsDataThrottler(int pBytes)
            {
+                if(pBytes < 10000)
+                    pBytes = 10000;
                ThrottleBytes = pBytes;
-                if(ThrottleBytes < 10000)
+                lastTimeElapsed = Util.GetTimeStampMS();
-                    ThrottleBytes = 10000;
-                lastTimeElapsed = Util.EnvironmentTickCount();
            }
            public bool hasEvents(UUID key, Dictionary<UUID, GetTextureModule.aPollResponse> responses)
            {
@@ -497,20 +498,17 @@ namespace OpenSim.Region.ClientStack.Linden
                return haskey;
            }
-            public void ProcessTime()
+            public void PassTime()
            {
-                PassTime();
+                double currenttime = Util.GetTimeStampMS();
-            }
+                double timeElapsed = currenttime - lastTimeElapsed;
+                if(timeElapsed < 50.0)
-            private void PassTime()
+                    return;
+                int add = (int)(ThrottleBytes * timeElapsed * 0.001);
+                if (add >= 1000)
            {
-                currenttime = Util.EnvironmentTickCount();
-                int timeElapsed = Util.EnvironmentTickCountSubtract(currenttime, lastTimeElapsed);
-                //processTimeBasedActions(responses);
-                if (timeElapsed >= 100)
-                {
                    lastTimeElapsed = currenttime;
-                    BytesSent -= (ThrottleBytes * timeElapsed / 1000);
+                    BytesSent -= add;
                    if (BytesSent < 0) BytesSent = 0;
                }
            }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 01c1fb9..861b79e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4137,6 +4137,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            Vector3 mypos = Vector3.Zero;
            ScenePresence mysp = (ScenePresence)SceneAgent;
+            bool orderedDequeue = m_scene.UpdatePrioritizationScheme  == UpdatePrioritizationSchemes.SimpleAngularDistance;
            // we should have a presence
            if(mysp == null)
                return;
@@ -4151,8 +4152,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            while (maxUpdatesBytes > 0)
            {
                lock (m_entityUpdates.SyncRoot)
-                    if (!m_entityUpdates.TryDequeue(out update, out timeinqueue))
+                {
-                        break;
+                    if(orderedDequeue)
+                    {
+                        if (!m_entityUpdates.TryOrderedDequeue(out update, out timeinqueue))
+                            break;
+                    }
+                    else
+                    {
+                        if (!m_entityUpdates.TryDequeue(out update, out timeinqueue))
+                            break;
+                    }
+                }
                PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags;
@@ -4850,6 +4861,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //            OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>> propertyUpdates =
 //                new OpenSim.Framework.Lazy<List<ObjectPropertyUpdate>>();
+            bool orderedDequeue = m_scene.UpdatePrioritizationScheme  == UpdatePrioritizationSchemes.SimpleAngularDistance;
            EntityUpdate iupdate;
            Int32 timeinqueue; // this is just debugging code & can be dropped later
@@ -4857,8 +4869,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            while (maxUpdateBytes > 0)
            {
                lock (m_entityProps.SyncRoot)
-                    if (!m_entityProps.TryDequeue(out iupdate, out timeinqueue))
+                {
-                        break;
+                    if(orderedDequeue)
+                    {
+                        if (!m_entityProps.TryOrderedDequeue(out iupdate, out timeinqueue))
+                            break;
+                    }
+                    else
+                    {
+                        if (!m_entityProps.TryDequeue(out iupdate, out timeinqueue))
+                            break;
+                    }
+                }
                ObjectPropertyUpdate update = (ObjectPropertyUpdate)iupdate;
                if (update.SendFamilyProps)
@@ -5526,6 +5548,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        #endregion
        #region Helper Methods
+        private void ClampVectorForUint(ref Vector3 v, float max)
+        {
+            float a,b;
+            a = Math.Abs(v.X);
+            b = Math.Abs(v.Y);
+            if(b > a)
+                a = b;
+            b= Math.Abs(v.Z);
+            if(b > a)
+                a = b;
+            if (a > max)
+            {
+                a = max / a;
+                v.X *= a;
+                v.Y *= a;
+                v.Z *= a;
+            }
+        }
        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedTerseBlock(ISceneEntity entity, bool sendTexture)
        {
@@ -5616,11 +5658,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            pos += 12;
            // Velocity
+            ClampVectorForUint(ref velocity, 128f);
            Utils.UInt16ToBytes(Utils.FloatToUInt16(velocity.X, -128.0f, 128.0f), data, pos); pos += 2;
            Utils.UInt16ToBytes(Utils.FloatToUInt16(velocity.Y, -128.0f, 128.0f), data, pos); pos += 2;
            Utils.UInt16ToBytes(Utils.FloatToUInt16(velocity.Z, -128.0f, 128.0f), data, pos); pos += 2;
            // Acceleration
+            ClampVectorForUint(ref acceleration, 64f);
            Utils.UInt16ToBytes(Utils.FloatToUInt16(acceleration.X, -64.0f, 64.0f), data, pos); pos += 2;
            Utils.UInt16ToBytes(Utils.FloatToUInt16(acceleration.Y, -64.0f, 64.0f), data, pos); pos += 2;
            Utils.UInt16ToBytes(Utils.FloatToUInt16(acceleration.Z, -64.0f, 64.0f), data, pos); pos += 2;
@@ -5632,6 +5676,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            Utils.UInt16ToBytes(Utils.FloatToUInt16(rotation.W, -1.0f, 1.0f), data, pos); pos += 2;
            // Angular Velocity
+            ClampVectorForUint(ref angularVelocity, 64f);
            Utils.UInt16ToBytes(Utils.FloatToUInt16(angularVelocity.X, -64.0f, 64.0f), data, pos); pos += 2;
            Utils.UInt16ToBytes(Utils.FloatToUInt16(angularVelocity.Y, -64.0f, 64.0f), data, pos); pos += 2;
            Utils.UInt16ToBytes(Utils.FloatToUInt16(angularVelocity.Z, -64.0f, 64.0f), data, pos); pos += 2;
@@ -5753,7 +5798,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            //update.JointPivot = Vector3.Zero;
            //update.JointType = 0;
            update.Material = part.Material;
-            update.MediaURL = Utils.EmptyBytes; // FIXME: Support this in OpenSim
 /*
            if (data.ParentGroup.IsAttachment)
            {
@@ -5832,8 +5876,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            update.TextureAnim = part.TextureAnimation ?? Utils.EmptyBytes;
            update.TextureEntry = part.Shape.TextureEntry ?? Utils.EmptyBytes;
            update.Scale = part.Shape.Scale;
-            update.Text = Util.StringToBytes256(part.Text);
+            update.Text = Util.StringToBytes(part.Text, 255);
-            update.MediaURL = Util.StringToBytes256(part.MediaUrl);
+            update.MediaURL = Util.StringToBytes(part.MediaUrl, 255);
            #region PrimFlags
@@ -6234,20 +6278,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name='x'></param>
        private bool CheckAgentCameraUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
        {
-            float vdelta = Vector3.Distance(x.CameraAtAxis, m_thisAgentUpdateArgs.CameraAtAxis);
+            if(Math.Abs(x.CameraCenter.X - m_thisAgentUpdateArgs.CameraCenter.X) > VDELTA ||
-            if((vdelta > VDELTA))
+               Math.Abs(x.CameraCenter.Y - m_thisAgentUpdateArgs.CameraCenter.Y) > VDELTA ||
-                return true;
+               Math.Abs(x.CameraCenter.Z - m_thisAgentUpdateArgs.CameraCenter.Z) > VDELTA ||
-            vdelta = Vector3.Distance(x.CameraCenter, m_thisAgentUpdateArgs.CameraCenter);
+               Math.Abs(x.CameraAtAxis.X - m_thisAgentUpdateArgs.CameraAtAxis.X) > VDELTA ||
-            if((vdelta > VDELTA))
+               Math.Abs(x.CameraAtAxis.Y - m_thisAgentUpdateArgs.CameraAtAxis.Y) > VDELTA ||
-                return true;
+//               Math.Abs(x.CameraAtAxis.Z - m_thisAgentUpdateArgs.CameraAtAxis.Z) > VDELTA ||
-            vdelta = Vector3.Distance(x.CameraLeftAxis, m_thisAgentUpdateArgs.CameraLeftAxis);
+               Math.Abs(x.CameraLeftAxis.X - m_thisAgentUpdateArgs.CameraLeftAxis.X) > VDELTA ||
-            if((vdelta > VDELTA))
+               Math.Abs(x.CameraLeftAxis.Y - m_thisAgentUpdateArgs.CameraLeftAxis.Y) > VDELTA ||
-                return true;
+//               Math.Abs(x.CameraLeftAxis.Z - m_thisAgentUpdateArgs.CameraLeftAxis.Z) > VDELTA ||
-            vdelta = Vector3.Distance(x.CameraUpAxis, m_thisAgentUpdateArgs.CameraUpAxis);
+               Math.Abs(x.CameraUpAxis.X - m_thisAgentUpdateArgs.CameraUpAxis.X) > VDELTA ||
-            if((vdelta > VDELTA))
+               Math.Abs(x.CameraUpAxis.Y - m_thisAgentUpdateArgs.CameraUpAxis.Y) > VDELTA
+//               Math.Abs(x.CameraLeftAxis.Z - m_thisAgentUpdateArgs.CameraLeftAxis.Z) > VDELTA ||
+            )
                return true;
            return false;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index f002ad7..ad46107 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -218,10 +218,39 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            // Count inventory items (different to asset count)
            CountItems++;
+            
            // Don't chase down link asset items as they actually point to their target item IDs rather than an asset
            if (SaveAssets && itemAssetType != AssetType.Link && itemAssetType != AssetType.LinkFolder)
+            {
+                int curErrorCntr = m_assetGatherer.ErrorCount;
+                int possible = m_assetGatherer.possibleNotAssetCount;
                m_assetGatherer.AddForInspection(inventoryItem.AssetID);
+                m_assetGatherer.GatherAll();
+                curErrorCntr =  m_assetGatherer.ErrorCount - curErrorCntr;
+                possible = m_assetGatherer.possibleNotAssetCount - possible;
+                if(curErrorCntr > 0 || possible > 0)
+                {
+                    string spath;
+                    int indx = path.IndexOf("__");
+                    if(indx > 0)
+                         spath = path.Substring(0,indx);
+                    else
+                        spath = path;
+                    if(curErrorCntr > 0)
+                    {
+                        m_log.ErrorFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references to  missing or damaged assets",
+                            inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, curErrorCntr);
+                        if(possible > 0)
+                            m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item also contains {0} references that may be to missing or damaged assets or not a problem", possible);
+                    }
+                    else if(possible > 0)
+                    {
+                        m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references that may be to missing or damaged assets or not a problem", inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, possible);
+                    }
+                }
+            }
        }
        /// <summary>
@@ -381,6 +410,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                    string errorMessage = string.Format("Aborted save.  Could not find inventory path {0}", m_invPath);
                    Exception e = new InventoryArchiverException(errorMessage);
                    m_module.TriggerInventoryArchiveSaved(m_id, false, m_userInfo, m_invPath, m_saveStream, e, 0, 0);
+                    if(m_saveStream != null && m_saveStream.CanWrite)
+                       m_saveStream.Close(); 
                    throw e;
                }
@@ -420,17 +451,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                {
                    m_assetGatherer.GatherAll();
+                    int errors = m_assetGatherer.FailedUUIDs.Count;
                    m_log.DebugFormat(
-                        "[INVENTORY ARCHIVER]: Saving {0} assets for items", m_assetGatherer.GatheredUuids.Count);
+                        "[INVENTORY ARCHIVER]: The items to save reference {0} possible assets", m_assetGatherer.GatheredUuids.Count + errors);
+                    if(errors > 0)
+                        m_log.DebugFormat("[INVENTORY ARCHIVER]: {0} of these have problems or are not assets and will be ignored", errors);
-                    AssetsRequest ar
+                    AssetsRequest ar = new AssetsRequest(
-                        = new AssetsRequest(
                            new AssetsArchiver(m_archiveWriter),
-                            m_assetGatherer.GatheredUuids, m_scene.AssetService,
+                            m_assetGatherer.GatheredUuids, m_assetGatherer.FailedUUIDs.Count,
+                            m_scene.AssetService,
                            m_scene.UserAccountService, m_scene.RegionInfo.ScopeID,
                            options, ReceivedAllAssets);
+                   ar.Execute();
-                    WorkManager.RunInThread(o => ar.Execute(), null, string.Format("AssetsRequest ({0})", m_scene.Name));
                }
                else
                {
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index be59eb5..06aec7b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -218,7 +218,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 //                    {
                        try
                        {
-                            new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, saveStream).Execute(options, UserAccountService);
+                            InventoryArchiveWriteRequest iarReq = new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, saveStream);
+                            iarReq.Execute(options, UserAccountService);
                        }
                        catch (EntryPointNotFoundException e)
                        {
@@ -261,7 +262,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 //                    {
                        try
                        {
-                            new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, savePath).Execute(options, UserAccountService);
+                            InventoryArchiveWriteRequest iarReq  = new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, savePath);
+                            iarReq.Execute(options, UserAccountService);
                        }
                        catch (EntryPointNotFoundException e)
                        {
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 3f3245c..f1409bb 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -412,7 +412,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
            Dictionary<UUID, Vector3> originalPositions = new Dictionary<UUID, Vector3>();
            Dictionary<UUID, Quaternion> originalRotations = new Dictionary<UUID, Quaternion>();
            // this possible is not needed if keyframes are saved
-            Dictionary<UUID, KeyframeMotion> originalKeyframes = new Dictionary<UUID, KeyframeMotion>();
+//            Dictionary<UUID, KeyframeMotion> originalKeyframes = new Dictionary<UUID, KeyframeMotion>();
            foreach (SceneObjectGroup objectGroup in objlist)
            {
@@ -423,8 +423,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                objectGroup.RootPart.SetForce(Vector3.Zero);
                objectGroup.RootPart.SetAngularImpulse(Vector3.Zero, false);
-                originalKeyframes[objectGroup.UUID] = objectGroup.RootPart.KeyframeMotion;
+//                originalKeyframes[objectGroup.UUID] = objectGroup.RootPart.KeyframeMotion;
-                objectGroup.RootPart.KeyframeMotion = null;
+//                objectGroup.RootPart.KeyframeMotion = null;
                Vector3 inventoryStoredPosition = objectGroup.AbsolutePosition;
                originalPositions[objectGroup.UUID] = inventoryStoredPosition;
@@ -476,7 +476,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
            {
                objectGroup.AbsolutePosition = originalPositions[objectGroup.UUID];
                objectGroup.RootPart.RotationOffset = originalRotations[objectGroup.UUID];
-                objectGroup.RootPart.KeyframeMotion = originalKeyframes[objectGroup.UUID];
+//                objectGroup.RootPart.KeyframeMotion = originalKeyframes[objectGroup.UUID];
                if (objectGroup.RootPart.KeyframeMotion != null)
                    objectGroup.RootPart.KeyframeMotion.Resume();
            }
@@ -989,11 +989,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                // one full update during the attachment
                // process causes some clients to fail to display the
                // attachment properly.
-                m_Scene.AddNewSceneObject(group, true, false);
                if (!attachment)
                {
                    group.AbsolutePosition = pos + veclist[i];
+                    m_Scene.AddNewSceneObject(group, true, false);
                    // Fire on_rez
                    group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1);
@@ -1001,6 +1001,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                    group.ScheduleGroupForFullUpdate();
                }
+                else
+                    m_Scene.AddNewSceneObject(group, true, false);
 //                m_log.DebugFormat(
 //                    "[INVENTORY ACCESS MODULE]:  Rezzed {0} {1} {2} ownermask={3:X} nextownermask={4:X} groupmask={5:X} everyonemask={6:X} for {7}",
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index c369d87..090cb7d 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -135,17 +135,13 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                        m_reuseableDynamicTextures.Store(
                            GenerateReusableTextureKey(texture.InputCommands, texture.InputParams), newTextureID);
                    }
+                    updater.newTextureID = newTextureID;
                }
-            }
-            if (updater.UpdateTimer == 0)
-            {
                lock (Updaters)
                {
-                    if (!Updaters.ContainsKey(updater.UpdaterID))
+                    if (Updaters.ContainsKey(updater.UpdaterID))
-                    {
                        Updaters.Remove(updater.UpdaterID);
-                    }
                }
            }
        }
@@ -172,21 +168,20 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
        }
        public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url,
-                                         string extraParams, int updateTimer)
+                                         string extraParams)
        {
-            return AddDynamicTextureURL(simID, primID, contentType, url, extraParams, updateTimer, false, 255);
+            return AddDynamicTextureURL(simID, primID, contentType, url, extraParams, false, 255);
        }
        public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url,
-                                         string extraParams, int updateTimer, bool SetBlending, byte AlphaValue)
+                                         string extraParams, bool SetBlending, byte AlphaValue)
        {
-            return AddDynamicTextureURL(simID, primID, contentType, url,
+            return AddDynamicTextureURL(simID, primID, contentType, url, extraParams, SetBlending,
-                                          extraParams, updateTimer, SetBlending,
+                                         (DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES);
-                                         (int)(DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES);
        }
        public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url,
-                                         string extraParams, int updateTimer, bool SetBlending,
+                                         string extraParams, bool SetBlending,
                                         int disp, byte AlphaValue, int face)
        {
            if (RenderPlugins.ContainsKey(contentType))
@@ -196,7 +191,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                updater.PrimID = primID;
                updater.ContentType = contentType;
                updater.Url = url;
-                updater.UpdateTimer = updateTimer;
                updater.UpdaterID = UUID.Random();
                updater.Params = extraParams;
                updater.BlendWithOldTexture = SetBlending;
@@ -213,26 +207,27 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                }
                RenderPlugins[contentType].AsyncConvertUrl(updater.UpdaterID, url, extraParams);
-                return updater.UpdaterID;
+                return updater.newTextureID;
            }
            return UUID.Zero;
        }
        public UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data,
-                                          string extraParams, int updateTimer)
+                                          string extraParams)
        {
-            return AddDynamicTextureData(simID, primID, contentType, data, extraParams, updateTimer, false, 255);
+            return AddDynamicTextureData(simID, primID, contentType, data, extraParams, false,
+                                            (DISP_TEMP|DISP_EXPIRE), 255, ALL_SIDES);
        }
        public UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data,
-                                          string extraParams, int updateTimer, bool SetBlending, byte AlphaValue)
+                                          string extraParams, bool SetBlending, byte AlphaValue)
        {
-            return AddDynamicTextureData(simID, primID, contentType, data, extraParams, updateTimer, SetBlending,
+            return AddDynamicTextureData(simID, primID, contentType, data, extraParams, SetBlending,
-                                          (int) (DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES);
+                                          (DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES);
        }
        public UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data,
-                                          string extraParams, int updateTimer, bool SetBlending, int disp, byte AlphaValue, int face)
+                                          string extraParams, bool SetBlending, int disp, byte AlphaValue, int face)
        {
            if (!RenderPlugins.ContainsKey(contentType))
                return UUID.Zero;
@@ -258,7 +253,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
            updater.PrimID = primID;
            updater.ContentType = contentType;
            updater.BodyData = data;
-            updater.UpdateTimer = updateTimer;
            updater.UpdaterID = UUID.Random();
            updater.Params = extraParams;
            updater.BlendWithOldTexture = SetBlending;
@@ -314,7 +308,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                updater.UpdatePart(part, (UUID)objReusableTextureUUID);
            }
-            return updater.UpdaterID;
+            return updater.newTextureID;
        }
        private string GenerateReusableTextureKey(string data, string extraParams)
@@ -404,17 +398,15 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
            public byte FrontAlpha = 255;
            public string Params;
            public UUID PrimID;
-            public bool SetNewFrontAlpha = false;
            public UUID SimUUID;
            public UUID UpdaterID;
-            public int UpdateTimer;
            public int Face;
            public int Disp;
            public string Url;
+            public UUID newTextureID;
            public DynamicTextureUpdater()
            {
-                UpdateTimer = 0;
                BodyData = null;
            }
@@ -436,16 +428,23 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                    // FIXME: Need to return the appropriate ID if only a single face is replaced.
                    oldID = tmptex.DefaultTexture.TextureID;
+                    // not using parts number of faces because that fails on old meshs
                    if (Face == ALL_SIDES)
                    {
                        oldID = tmptex.DefaultTexture.TextureID;
                        tmptex.DefaultTexture.TextureID = textureID;
+                        for(int i = 0; i < tmptex.FaceTextures.Length; i++)
+                        {
+                            if(tmptex.FaceTextures[i] != null)
+                                tmptex.FaceTextures[i].TextureID = textureID;
+                        }
                    }
                    else
                    {
                        try
                        {
                            Primitive.TextureEntryFace texface = tmptex.CreateFace((uint)Face);
+                            oldID = texface.TextureID;
                            texface.TextureID = textureID;
                            tmptex.FaceTextures[Face] = texface;
                        }
@@ -455,10 +454,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                        }
                    }
-                    // 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());
                }
@@ -491,13 +486,26 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                if (BlendWithOldTexture)
                {
-                    Primitive.TextureEntryFace defaultFace = part.Shape.Textures.DefaultTexture;
+                    Primitive.TextureEntryFace curFace;
-                    if (defaultFace != null)
+                    if(Face == ALL_SIDES)
+                        curFace = part.Shape.Textures.DefaultTexture;
+                    else
+                    {
+                        try
+                        {
+                            curFace = part.Shape.Textures.GetFace((uint)Face);
+                        }
+                        catch
+                        {
+                            curFace = null;
+                        }
+                    }
+                    if (curFace != null)
                    {
-                        oldAsset = scene.AssetService.Get(defaultFace.TextureID.ToString());
+                        oldAsset = scene.AssetService.Get(curFace.TextureID.ToString());
                        if (oldAsset != null)
-                            assetData = BlendTextures(data, oldAsset.Data, SetNewFrontAlpha, FrontAlpha);
+                            assetData = BlendTextures(data, oldAsset.Data, FrontAlpha);
                    }
                }
@@ -548,7 +556,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                return asset.FullID;
            }
-            private byte[] BlendTextures(byte[] frontImage, byte[] backImage, bool setNewAlpha, byte newAlpha)
+            private byte[] BlendTextures(byte[] frontImage, byte[] backImage, byte newAlpha)
            {
                ManagedImage managedImage;
                Image image;
@@ -568,7 +576,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                Bitmap image2 = new Bitmap(image);
                image.Dispose();
-                if (setNewAlpha)
+                if (newAlpha < 255)
                    SetAlpha(ref image1, newAlpha);
                using(Bitmap joint = MergeBitMaps(image1, image2))
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index b499b19..d342163 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -379,9 +379,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
            if (ThreadPool == null)
            {
                STPStartInfo startInfo = new STPStartInfo();
-                startInfo.IdleTimeout = 20000;
+                startInfo.IdleTimeout = 2000;
                startInfo.MaxWorkerThreads = maxThreads;
-                startInfo.MinWorkerThreads = 1;
+                startInfo.MinWorkerThreads = 0;
                startInfo.ThreadPriority = ThreadPriority.BelowNormal;
                startInfo.StartSuspended = true;
                startInfo.ThreadPoolName = "ScriptsHttpReq";
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
index ed255bf..325f7f9 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
@@ -77,8 +77,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                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));
        }
@@ -98,8 +97,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                so.UUID,
                m_vrm.GetContentType(),
                dtText,
-                "",
+                "");
-                0);
            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
@@ -108,8 +106,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                so.UUID,
                m_vrm.GetContentType(),
                dtText,
-                "",
+                "");
-                0);
            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
        }
@@ -129,8 +126,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                so.UUID,
                m_vrm.GetContentType(),
                dtText,
-                "",
+                "");
-                0);
            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
@@ -139,8 +135,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                so.UUID,
                m_vrm.GetContentType(),
                dtText,
-                "alpha:250",
+                "alpha:250");
-                0);
            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
        }
@@ -161,8 +156,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                so.UUID,
                m_vrm.GetContentType(),
                dtText,
-                "",
+                "");
-                0);
            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
@@ -171,8 +165,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                so.UUID,
                m_vrm.GetContentType(),
                dtText,
-                "",
+                "");
-                0);
            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
        }
@@ -191,8 +184,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                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));
        }
@@ -213,8 +205,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                so.UUID,
                m_vrm.GetContentType(),
                dtText,
-                "",
+                "");
-                0);
            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
@@ -223,8 +214,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                so.UUID,
                m_vrm.GetContentType(),
                dtText,
-                "",
+                "");
-                0);
            Assert.That(firstDynamicTextureID, Is.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
        }
@@ -253,8 +243,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                so.UUID,
                m_vrm.GetContentType(),
                dtText,
-                "1024",
+                "1024");
-                0);
            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
@@ -263,8 +252,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                so.UUID,
                m_vrm.GetContentType(),
                dtText,
-                "1024",
+                "1024");
-                0);
            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
        }
@@ -284,8 +272,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                so.UUID,
                m_vrm.GetContentType(),
                dtText,
-                "",
+                "");
-                0);
            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
@@ -294,8 +281,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                so.UUID,
                m_vrm.GetContentType(),
                dtText,
-                "alpha:250",
+                "alpha:250");
-                0);
            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
        }
@@ -316,8 +302,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                so.UUID,
                m_vrm.GetContentType(),
                dtText,
-                "",
+                "");
-                0);
            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
@@ -326,8 +311,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                so.UUID,
                m_vrm.GetContentType(),
                dtText,
-                "",
+                "");
-                0);
            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
        }
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index f12286d..8a26ab7 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -355,30 +355,22 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                lock (this)
                {
                    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)
                    {
+                        bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb);
+                        graph = Graphics.FromImage(bitmap);
                        using (SolidBrush bgFillBrush = new SolidBrush(bgColor))
                        {
                            graph.FillRectangle(bgFillBrush, 0, 0, width, height);
                        }
-                    }
+                    }                   
+                    else
-                    for (int w = 0; w < bitmap.Width; w++)
                    {
-                        if (alpha <= 255)
+                        bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+                        graph = Graphics.FromImage(bitmap);
+                        Color newbg = Color.FromArgb(alpha,bgColor);
+                        using (SolidBrush bgFillBrush = new SolidBrush(newbg))
                        {
-                            for (int h = 0; h < bitmap.Height; h++)
+                            graph.FillRectangle(bgFillBrush, 0, 0, width, height);
-                            {
-                                bitmap.SetPixel(w, h, Color.FromArgb(alpha, bitmap.GetPixel(w, h)));
-                            }
                        }
                    }
@@ -519,8 +511,32 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 //                    m_log.DebugFormat("[VECTOR RENDER MODULE]: Processing line '{0}'", nextLine);
+                    if (nextLine.StartsWith("ResetTransf"))
+                    {
+                        graph.ResetTransform();
+                    }
+                    else if (nextLine.StartsWith("TransTransf"))
+                    {
+                        float x = 0;
+                        float y = 0;
+                        GetParams(partsDelimiter, ref nextLine, 11, ref x, ref y);
+                        graph.TranslateTransform(x, y);
+                    }
+                    else if (nextLine.StartsWith("ScaleTransf"))
+                    {
+                        float x = 0;
+                        float y = 0;
+                        GetParams(partsDelimiter, ref nextLine, 11, ref x, ref y);
+                        graph.ScaleTransform(x, y);
+                    }
+                    else if (nextLine.StartsWith("RotTransf"))
+                    {
+                        float x = 0;
+                        GetParams(partsDelimiter, ref nextLine, 9, ref x);
+                        graph.RotateTransform(x);
+                    }
                    //replace with switch, or even better, do some proper parsing
-                    if (nextLine.StartsWith("MoveTo"))
+                    else if (nextLine.StartsWith("MoveTo"))
                    {
                        float x = 0;
                        float y = 0;
@@ -625,6 +641,17 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                        startPoint.X += endPoint.X;
                        startPoint.Y += endPoint.Y;
                    }
+                    else if (nextLine.StartsWith("FillEllipse"))
+                    {
+                        float x = 0;
+                        float y = 0;
+                        GetParams(partsDelimiter, ref nextLine, 11, ref x, ref y);
+                        endPoint.X = (int)x;
+                        endPoint.Y = (int)y;
+                        graph.FillEllipse(myBrush, startPoint.X, startPoint.Y, endPoint.X, endPoint.Y);
+                        startPoint.X += endPoint.X;
+                        startPoint.Y += endPoint.Y;
+                    }
                    else if (nextLine.StartsWith("FontSize"))
                    {
                        nextLine = nextLine.Remove(0, 8);
@@ -790,6 +817,17 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
            }
        }
+        private static void GetParams(char[] partsDelimiter, ref string line, int startLength, ref float x)
+        {
+            line = line.Remove(0, startLength);
+            string[] parts = line.Split(partsDelimiter);
+            if (parts.Length > 0)
+            {
+                string xVal = parts[0].Trim();
+                x = Convert.ToSingle(xVal, CultureInfo.InvariantCulture);
+            }
+        }
        private static void GetParams(char[] partsDelimiter, ref string line, int startLength, ref float x, ref float y)
        {
            line = line.Remove(0, startLength);
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index f68c5f8..6028eef 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
        public void Process()
        {
            _finished = false;
-            httpThread = WorkManager.StartThread(SendRequest, "HttpRequestThread", ThreadPriority.BelowNormal, true, false, null, int.MaxValue);
+            httpThread = WorkManager.StartThread(SendRequest, "XMLRPCreqThread", ThreadPriority.BelowNormal, true, false, null, int.MaxValue);
        }
        /*
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
index 8dabcee..11c53d7 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
@@ -181,11 +181,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                // Archive the regions
                Dictionary<UUID, sbyte> assetUuids = new Dictionary<UUID, sbyte>();
+                HashSet<UUID> failedIDs = new HashSet<UUID>();
+                HashSet<UUID> uncertainAssetsUUIDs = new HashSet<UUID>();
                scenesGroup.ForEachScene(delegate(Scene scene)
                {
                    string regionDir = MultiRegionFormat ? scenesGroup.GetRegionDir(scene.RegionInfo.RegionID) : "";
-                    ArchiveOneRegion(scene, regionDir, assetUuids);
+                    ArchiveOneRegion(scene, regionDir, assetUuids, failedIDs, uncertainAssetsUUIDs);
                });
                // Archive the assets
@@ -193,23 +195,21 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                if (SaveAssets)
                {
                    m_log.DebugFormat("[ARCHIVER]: Saving {0} assets", assetUuids.Count);
+                    
-                    // Asynchronously request all the assets required to perform this archive operation
+                    AssetsRequest ar = new AssetsRequest(
-                    AssetsRequest ar
-                        = new AssetsRequest(
                            new AssetsArchiver(m_archiveWriter), assetUuids,
+                            failedIDs.Count,
                            m_rootScene.AssetService, m_rootScene.UserAccountService,
-                            m_rootScene.RegionInfo.ScopeID, options, ReceivedAllAssets);
+                            m_rootScene.RegionInfo.ScopeID, options, null);
+                    ar.Execute();
-                    WorkManager.RunInThread(o => ar.Execute(), null, "Archive Assets Request");
+                    assetUuids = null;
-                    // CloseArchive() will be called from ReceivedAllAssets()
                }
                else
                {
                    m_log.DebugFormat("[ARCHIVER]: Not saving assets since --noassets was specified");
-                    CloseArchive(string.Empty);
+//                    CloseArchive(string.Empty);
                }
+                CloseArchive(string.Empty);
            }
            catch (Exception e)
            {
@@ -218,7 +218,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            }
        }
-        private void ArchiveOneRegion(Scene scene, string regionDir, Dictionary<UUID, sbyte> assetUuids)
+        private void ArchiveOneRegion(Scene scene, string regionDir, Dictionary<UUID, sbyte> assetUuids,
+            HashSet<UUID> failedIDs, HashSet<UUID>  uncertainAssetsUUIDs)
        {
            m_log.InfoFormat("[ARCHIVER]: Writing region {0}", scene.Name);
@@ -237,7 +238,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                {
                    SceneObjectGroup sceneObject = (SceneObjectGroup)entity;
-                    if (!sceneObject.IsDeleted && !sceneObject.IsAttachment)
+                    if (!sceneObject.IsDeleted && !sceneObject.IsAttachment && !sceneObject.IsTemporary && !sceneObject.inTransit)
                    {
                        if (!CanUserArchiveObject(scene.RegionInfo.EstateSettings.EstateOwner, sceneObject, FilterContent, permissionsModule))
                        {
@@ -254,17 +255,39 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            if (SaveAssets)
            {
-                UuidGatherer assetGatherer = new UuidGatherer(scene.AssetService, assetUuids);
+                UuidGatherer assetGatherer = new UuidGatherer(scene.AssetService, assetUuids, failedIDs, uncertainAssetsUUIDs);
                int prevAssets = assetUuids.Count;
                foreach (SceneObjectGroup sceneObject in sceneObjects)
+                {
+                    int curErrorCntr = assetGatherer.ErrorCount;
+                    int possible = assetGatherer.possibleNotAssetCount;
                    assetGatherer.AddForInspection(sceneObject);
+                    assetGatherer.GatherAll();
+                    curErrorCntr =  assetGatherer.ErrorCount - curErrorCntr;
+                    possible = assetGatherer.possibleNotAssetCount - possible;
+                    if(curErrorCntr > 0)
+                    {
+                        m_log.ErrorFormat("[ARCHIVER]: object {0} '{1}', at {2}, contains {3} references to missing or damaged assets",
+                            sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), curErrorCntr);
+                        if(possible > 0)
+                            m_log.WarnFormat("[ARCHIVER Warning]: object also contains {0} references that may be to missing or damaged assets or not a problem", possible);
+                    }
+                    else if(possible > 0)
+                    {
+                        m_log.WarnFormat("[ARCHIVER Warning]: object {0} '{1}', at {2}, contains {3} references that may be to missing or damaged assets or not a problem",
+                            sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), possible);
+                    }
+                }
                assetGatherer.GatherAll();
+                int errors = assetGatherer.FailedUUIDs.Count;
                m_log.DebugFormat(
-                    "[ARCHIVER]: {0} scene objects to serialize requiring save of {1} assets",
+                    "[ARCHIVER]: {0} region scene objects to save reference {1} possible assets",
-                    sceneObjects.Count, assetUuids.Count - prevAssets);
+                    sceneObjects.Count, assetUuids.Count - prevAssets + errors);
+                if(errors > 0)
+                    m_log.DebugFormat("[ARCHIVER]: {0} of these have problems or are not assets and will be ignored", errors);
            }
            if (numObjectsSkippedPermissions > 0)
@@ -572,7 +595,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            foreach (SceneObjectGroup sceneObject in sceneObjects)
            {
                //m_log.DebugFormat("[ARCHIVER]: Saving {0} {1}, {2}", entity.Name, entity.UUID, entity.GetType());
+                if(sceneObject.IsDeleted || sceneObject.inTransit)
+                    continue;
                string serializedObject = serializer.SerializeGroupToXml2(sceneObject, m_options);
                string objectPath = string.Format("{0}{1}", regionDir, ArchiveHelpers.CreateObjectPath(sceneObject));
                m_archiveWriter.WriteFile(objectPath, serializedObject);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index efacae3..3092fe0 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
        /// <value>
        /// Post a message to the log every x assets as a progress bar
        /// </value>
-        protected static int LOG_ASSET_LOAD_NOTIFICATION_INTERVAL = 50;
+        protected static int LOG_ASSET_LOAD_NOTIFICATION_INTERVAL = 100;
        /// <value>
        /// Keep a count of the number of assets written so that we can provide status updates
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index d380da8..91f4dc3 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -62,27 +62,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
        };
        /// <value>
-        /// Timeout threshold if we still need assets or missing asset notifications but have stopped receiving them
-        /// from the asset service
-        /// </value>
-        protected const int TIMEOUT = 60 * 1000;
-        /// <value>
-        /// If a timeout does occur, limit the amount of UUID information put to the console.
-        /// </value>
-        protected const int MAX_UUID_DISPLAY_ON_TIMEOUT = 3;
-        protected System.Timers.Timer m_requestCallbackTimer;
-        /// <value>
-        /// State of this request
-        /// </value>
-        private RequestState m_requestState = RequestState.Initial;
-        /// <value>
        /// uuids to request
        /// </value>
        protected IDictionary<UUID, sbyte> m_uuids;
+        private int m_previousErrorsCount;
        /// <value>
        /// Callback used when all the assets requested have been received.
@@ -104,6 +87,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
        /// </value>
        private int m_repliesRequired;
+        private System.Timers.Timer m_timeOutTimer;
+        private bool m_timeout;
        /// <value>
        /// Asset service used to request the assets
        /// </value>
@@ -117,205 +103,98 @@ namespace OpenSim.Region.CoreModules.World.Archiver
        protected internal AssetsRequest(
            AssetsArchiver assetsArchiver, IDictionary<UUID, sbyte> uuids,
+            int previousErrorsCount,
            IAssetService assetService, IUserAccountService userService,
            UUID scope, Dictionary<string, object> options,
            AssetsRequestCallback assetsRequestCallback)
        {
            m_assetsArchiver = assetsArchiver;
            m_uuids = uuids;
+            m_previousErrorsCount = previousErrorsCount;
            m_assetsRequestCallback = assetsRequestCallback;
            m_assetService = assetService;
            m_userAccountService = userService;
            m_scopeID = scope;
            m_options = options;
            m_repliesRequired = uuids.Count;
-            // FIXME: This is a really poor way of handling the timeout since it will always leave the original requesting thread
-            // hanging.  Need to restructure so an original request thread waits for a ManualResetEvent on asset received
-            // so we can properly abort that thread.  Or request all assets synchronously, though that would be a more
-            // radical change
-            m_requestCallbackTimer = new System.Timers.Timer(TIMEOUT);
-            m_requestCallbackTimer.AutoReset = false;
-            m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout);
        }
        protected internal void Execute()
        {
-            m_requestState = RequestState.Running;
+            Culture.SetCurrentCulture();
-            m_log.DebugFormat("[ARCHIVER]: AssetsRequest executed looking for {0} possible assets", m_repliesRequired);
            // We can stop here if there are no assets to fetch
            if (m_repliesRequired == 0)
            {
-                m_requestState = RequestState.Completed;
                PerformAssetsRequestCallback(false);
                return;
            }
-            m_requestCallbackTimer.Enabled = true;
+            m_timeOutTimer = new System.Timers.Timer(60000);
+            m_timeOutTimer .AutoReset = false;
+            m_timeOutTimer.Elapsed += OnTimeout;
+            m_timeout = false;
            foreach (KeyValuePair<UUID, sbyte> kvp in m_uuids)
            {
-//                m_log.DebugFormat("[ARCHIVER]: Requesting asset {0}", kvp.Key);
+                string thiskey = kvp.Key.ToString();
+                try
-//                m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback);
-                AssetBase asset = m_assetService.Get(kvp.Key.ToString());
-                PreAssetRequestCallback(kvp.Key.ToString(), kvp.Value, asset);
-            }
-        }
-        protected void OnRequestCallbackTimeout(object source, ElapsedEventArgs args)
-        {
-            bool timedOut = true;
-            try
-            {
-                lock (this)
                {
-                    // Take care of the possibilty that this thread started but was paused just outside the lock before
+                    m_timeOutTimer.Enabled = true;
-                    // the final request came in (assuming that such a thing is possible)
+                    AssetBase asset = m_assetService.Get(thiskey);
-                    if (m_requestState == RequestState.Completed)
+                    if(m_timeout)
+                        break;
+                        
+                    m_timeOutTimer.Enabled = false;
+                    if(asset == null)
                    {
-                        timedOut = false;
+                        m_notFoundAssetUuids.Add(new UUID(thiskey));
-                        return;
+                        continue;
                    }
-                    m_requestState = RequestState.Aborted;
+                    sbyte assetType = kvp.Value;
-                }
+                    if (asset != null && assetType == (sbyte)AssetType.Unknown)
+                    {
-                // Calculate which uuids were not found.  This is an expensive way of doing it, but this is a failure
+                        m_log.InfoFormat("[ARCHIVER]: Rewriting broken asset type for {0} to {1}", thiskey, SLUtil.AssetTypeFromCode(assetType));
-                // case anyway.
+                        asset.Type = assetType;
-                List<UUID> uuids = new List<UUID>();
+                    }
-                foreach (UUID uuid in m_uuids.Keys)
-                {
-                    uuids.Add(uuid);
-                }
-                foreach (UUID uuid in m_foundAssetUuids)
-                {
-                    uuids.Remove(uuid);
-                }
-                foreach (UUID uuid in m_notFoundAssetUuids)
+                    m_foundAssetUuids.Add(asset.FullID);
-                {
+                    m_assetsArchiver.WriteAsset(PostProcess(asset));
-                    uuids.Remove(uuid);
                }
-                m_log.ErrorFormat(
+                catch (Exception e)
-                    "[ARCHIVER]: Asset service failed to return information about {0} requested assets", uuids.Count);
-                int i = 0;
-                foreach (UUID uuid in uuids)
                {
-                    m_log.ErrorFormat("[ARCHIVER]: No information about asset {0} received", uuid);
+                    m_log.ErrorFormat("[ARCHIVER]: Execute failed with {0}", e);
-                    if (++i >= MAX_UUID_DISPLAY_ON_TIMEOUT)
-                        break;
                }
-                if (uuids.Count > MAX_UUID_DISPLAY_ON_TIMEOUT)
-                    m_log.ErrorFormat(
-                        "[ARCHIVER]: (... {0} more not shown)", uuids.Count - MAX_UUID_DISPLAY_ON_TIMEOUT);
-                m_log.Error("[ARCHIVER]: Archive save aborted.  PLEASE DO NOT USE THIS ARCHIVE, IT WILL BE INCOMPLETE.");
            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[ARCHIVER]: Timeout handler exception {0}{1}", e.Message, e.StackTrace);
-            }
-            finally
-            {
-                if (timedOut)
-                    WorkManager.RunInThread(PerformAssetsRequestCallback, true, "Archive Assets Request Callback");
-            }
-        }
-        protected void PreAssetRequestCallback(string fetchedAssetID, object assetType, AssetBase fetchedAsset)
+            m_timeOutTimer.Dispose();
-        {
+            int totalerrors = m_notFoundAssetUuids.Count + m_previousErrorsCount;
-            // Check for broken asset types and fix them with the AssetType gleaned by UuidGatherer
-            if (fetchedAsset != null && fetchedAsset.Type == (sbyte)AssetType.Unknown)
-            {
-                m_log.InfoFormat("[ARCHIVER]: Rewriting broken asset type for {0} to {1}", fetchedAsset.ID,  SLUtil.AssetTypeFromCode((sbyte)assetType));
-                fetchedAsset.Type = (sbyte)assetType;
-            }
-            AssetRequestCallback(fetchedAssetID, this, fetchedAsset);
+            if(m_timeout)
-        }
+                m_log.DebugFormat("[ARCHIVER]: Aborted because AssetService request timeout. Successfully added {0} assets", m_foundAssetUuids.Count);
+            else if(totalerrors == 0)
+                m_log.DebugFormat("[ARCHIVER]: Successfully added all {0} assets", m_foundAssetUuids.Count);
+            else
+                m_log.DebugFormat("[ARCHIVER]: Successfully added {0} assets ({1} of total possible assets requested were not found, were damaged or were not assets)",
+                            m_foundAssetUuids.Count, totalerrors);
-        /// <summary>
+            PerformAssetsRequestCallback(m_timeout);
-        /// Called back by the asset cache when it has the asset
+        }
-        /// </summary>
+  
-        /// <param name="assetID"></param>
+        private void OnTimeout(object source, ElapsedEventArgs args)
-        /// <param name="asset"></param>
-        public void AssetRequestCallback(string id, object sender, AssetBase asset)
        {
-            Culture.SetCurrentCulture();
+            m_timeout = true;
-            try
-            {
-                lock (this)
-                {
-                    //m_log.DebugFormat("[ARCHIVER]: Received callback for asset {0}", id);
-                    m_requestCallbackTimer.Stop();
-                    if ((m_requestState == RequestState.Aborted) || (m_requestState == RequestState.Completed))
-                    {
-                        m_log.WarnFormat(
-                            "[ARCHIVER]: Received information about asset {0} while in state {1}.  Ignoring.",
-                            id, m_requestState);
-                        return;
-                    }
-                    if (asset != null)
-                    {
-//                        m_log.DebugFormat("[ARCHIVER]: Writing asset {0}", id);
-                        m_foundAssetUuids.Add(asset.FullID);
-                        m_assetsArchiver.WriteAsset(PostProcess(asset));
-                    }
-                    else
-                    {
-//                        m_log.DebugFormat("[ARCHIVER]: Recording asset {0} as not found", id);
-                        m_notFoundAssetUuids.Add(new UUID(id));
-                    }
-                    if (m_foundAssetUuids.Count + m_notFoundAssetUuids.Count >= m_repliesRequired)
-                    {
-                        m_requestState = RequestState.Completed;
-                        if(m_notFoundAssetUuids.Count == 0)
-                            m_log.DebugFormat(
-                                    "[ARCHIVER]: Successfully added {0} assets",
-                                    m_foundAssetUuids.Count);
-                        else
-                            m_log.DebugFormat(
-                                    "[ARCHIVER]: Successfully added {0} assets ({1} assets not found but these may be expected invalid references)",
-                            m_foundAssetUuids.Count, m_notFoundAssetUuids.Count);
-                        // We want to stop using the asset cache thread asap
-                        // as we now need to do the work of producing the rest of the archive
-                        WorkManager.RunInThread(PerformAssetsRequestCallback, false, "Archive Assets Request Callback");
-                    }
-                    else
-                    {
-                        m_requestCallbackTimer.Start();
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e);
-            }
        }
        /// <summary>
        /// Perform the callback on the original requester of the assets
        /// </summary>
-        protected void PerformAssetsRequestCallback(object o)
+        private void PerformAssetsRequestCallback(object o)
        {
+            if(m_assetsRequestCallback == null)
+                return;
            Culture.SetCurrentCulture();
            Boolean timedOut = (Boolean)o;
@@ -331,7 +210,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            }
        }
-        protected AssetBase PostProcess(AssetBase asset)
+        private AssetBase PostProcess(AssetBase asset)
        {
            if (asset.Type == (sbyte)AssetType.Object && asset.Data != null && m_options.ContainsKey("home"))
            {
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index b59e2af..5ff063b 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -176,6 +176,14 @@ namespace OpenSim.Region.CoreModules.World.Land
            }
        }
+        public void SendParcelsOverlay(IClientAPI client)
+        {
+            if (m_landManagementModule != null)
+            {
+                m_landManagementModule.SendParcelOverlay(client);
+            }
+        }
        public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
        {
            if (m_landManagementModule != null)
diff --git a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs
index 441076d..093ea9c 100644
--- a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs
@@ -44,14 +44,13 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <param name='isReuseable'></param>
        void ReturnData(UUID id, IDynamicTexture texture);
+        UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams);
        UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams,
-                                    int updateTimer);
+                                bool SetBlending, byte AlphaValue);
        UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams,
-                                   int updateTimer, bool SetBlending, byte AlphaValue);
+                                bool SetBlending, int disp, byte AlphaValue, int face);
-        UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams,
-                                   int updateTimer, bool SetBlending, int disp, byte AlphaValue, int face);
+        UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams);
-        UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams,
-                                     int updateTimer);
        /// Apply a dynamically generated texture to all sides of the given prim.  The texture is not persisted to the
        /// asset service.
@@ -62,8 +61,6 @@ namespace OpenSim.Region.Framework.Interfaces
        /// based texture or "image" to create a texture from an image at a particular URL</param>
        /// <param name="data">The data for the generator</param>
        /// <param name="extraParams">Parameters for the generator that don't form part of the main data.</param>
-        /// <param name="updateTimer">If zero, the image is never updated after the first generation.  If positive
-        /// the image is updated at the given interval.  Not implemented for </param>
        /// <param name="SetBlending">
        /// If true, the newly generated texture is blended with the appropriate existing ones on the prim
        /// </param>
@@ -76,7 +73,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// can be obtained as SceneObjectPart.Shape.Textures.DefaultTexture.TextureID
        /// </returns>
        UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams,
-                                    int updateTimer, bool SetBlending, byte AlphaValue);
+                                    bool SetBlending, byte AlphaValue);
        /// <summary>
        /// Apply a dynamically generated texture to the given prim.
@@ -87,8 +84,6 @@ namespace OpenSim.Region.Framework.Interfaces
        /// based texture or "image" to create a texture from an image at a particular URL</param>
        /// <param name="data">The data for the generator</param>
        /// <param name="extraParams">Parameters for the generator that don't form part of the main data.</param>
-        /// <param name="updateTimer">If zero, the image is never updated after the first generation.  If positive
-        /// the image is updated at the given interval.  Not implemented for </param>
        /// <param name="SetBlending">
        /// If true, the newly generated texture is blended with the appropriate existing ones on the prim
        /// </param>
@@ -109,9 +104,8 @@ namespace OpenSim.Region.Framework.Interfaces
        /// to obtain it directly from the SceneObjectPart.  For instance, if ALL_SIDES is set then this texture
        /// can be obtained as SceneObjectPart.Shape.Textures.DefaultTexture.TextureID
        /// </returns>
-        UUID AddDynamicTextureData(
+        UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams,
-            UUID simID, UUID primID, string contentType, string data, string extraParams,
+                    bool SetBlending, int disp, byte AlphaValue, int face);
-            int updateTimer, bool SetBlending, int disp, byte AlphaValue, int face);
        void GetDrawStringSize(string contentType, string text, string fontName, int fontSize,
                               out double xSize, out double ySize);
diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
index e76fef4..63aafcd 100644
--- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
+++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
@@ -116,16 +116,20 @@ namespace OpenSim.Region.Framework.Scenes
        public static void PartCollisionSound(SceneObjectPart part, List<CollisionForSoundInfo> collidersinfolist)
        {
+            if (part.CollisionSoundType < 0)
+                return;
            if (collidersinfolist.Count == 0 || part == null)
                return;
            if (part.VolumeDetectActive || (part.Flags & PrimFlags.Physics) == 0)
                return;
-            if (part.ParentGroup == null)
+            SceneObjectGroup sog = part.ParentGroup;
+            if (sog == null || sog.IsDeleted || sog.inTransit)
                return;
-            if (part.CollisionSoundType < 0)
+            if(sog.CollisionSoundThrottled(part.CollisionSoundType))
                return;
            float volume = part.CollisionSoundVolume;
@@ -189,15 +193,23 @@ namespace OpenSim.Region.Framework.Scenes
                        continue;
                    }
-                SceneObjectPart otherPart = part.ParentGroup.Scene.GetSceneObjectPart(id);
+                SceneObjectPart otherPart = sog.Scene.GetSceneObjectPart(id);
                if (otherPart != null)
                {
-                    if (otherPart.CollisionSoundType < 0 || otherPart.VolumeDetectActive)
+                    SceneObjectGroup othersog = otherPart.ParentGroup;
+                    if(othersog == null || othersog.IsDeleted || othersog.inTransit)
+                        continue;
+                    int otherType = otherPart.CollisionSoundType;
+                    if (otherType < 0 || otherPart.VolumeDetectActive)
                        continue;
                    if (!HaveSound)
                    {
-                        if (otherPart.CollisionSoundType == 1)
+                        if(othersog.CollisionSoundThrottled(otherType))
+                            continue;
+                        if (otherType == 1)
                        {
                            soundID = otherPart.CollisionSound;
                            volume = otherPart.CollisionSoundVolume;
@@ -206,7 +218,7 @@ namespace OpenSim.Region.Framework.Scenes
                        }
                        else
                        {
-                            if (otherPart.CollisionSoundType == 2)
+                            if (otherType == 2)
                            {
                                volume = otherPart.CollisionSoundVolume;
                                if (volume == 0.0f)
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 827f91e..f76f882 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -855,7 +855,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <see cref="Scene.DeleteSceneObject"/>,
        /// <see cref="Scene.SelectPrim"/>,
        /// <see cref="Scene.DeselectPrim"/>,
-        /// <see cref="SceneObjectGroup.UpdatePrimFlags"/>,
+        /// <see cref="SceneObjectGroup.UpdateFlags"/>,
        /// <see cref="SceneObjectGroup.AbsolutePosition"/>
        /// </remarks>
        public event ParcelPrimCountTainted OnParcelPrimCountTainted;
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index d81d8a2..80ee510 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -295,6 +295,7 @@ namespace OpenSim.Region.Framework.Scenes
            lock (m_frames)
            {
                KeyframeTimer.Add(this);
+                m_lasttickMS = Util.GetTimeStampMS();
                m_timerStopped = false;
            }
        }
@@ -326,8 +327,8 @@ namespace OpenSim.Region.Framework.Scenes
                        newMotion.m_selected = true;
                }
-                newMotion.m_timerStopped = false;
+//                newMotion.m_timerStopped = false;
-                newMotion.m_running = true;
+//                newMotion.m_running = true;
                newMotion.m_isCrossing = false;
                newMotion.m_waitingCrossing = false;
            }
@@ -483,9 +484,10 @@ namespace OpenSim.Region.Framework.Scenes
            m_group.RootPart.Velocity = Vector3.Zero;
            m_group.RootPart.AngularVelocity = Vector3.Zero;
-            m_group.SendGroupRootTerseUpdate();
+//            m_group.SendGroupRootTerseUpdate();
-//            m_group.RootPart.ScheduleTerseUpdate();
+            m_group.RootPart.ScheduleTerseUpdate();
            m_frames.Clear();
+            m_group.Scene.EventManager.TriggerMovingEndEvent(m_group.RootPart.LocalId);
        }
        public void Pause()
@@ -496,8 +498,9 @@ namespace OpenSim.Region.Framework.Scenes
            m_group.RootPart.Velocity = Vector3.Zero;
            m_group.RootPart.AngularVelocity = Vector3.Zero;
            m_skippedUpdates = 1000;
-            m_group.SendGroupRootTerseUpdate();
+//            m_group.SendGroupRootTerseUpdate();
-//            m_group.RootPart.ScheduleTerseUpdate();
+            m_group.RootPart.ScheduleTerseUpdate();
+            m_group.Scene.EventManager.TriggerMovingEndEvent(m_group.RootPart.LocalId);
        }
        public void Suspend()
@@ -644,15 +647,16 @@ namespace OpenSim.Region.Framework.Scenes
            m_group.RootPart.Velocity = Vector3.Zero;
            m_group.RootPart.AngularVelocity = Vector3.Zero;
-            m_group.SendGroupRootTerseUpdate();
+//            m_group.SendGroupRootTerseUpdate();
- 
+            m_group.RootPart.ScheduleTerseUpdate();
            m_frames.Clear();
        }
-        Vector3 m_lastPosUpdate;
+        [NonSerialized()] Vector3 m_lastPosUpdate;
-        Quaternion m_lastRotationUpdate;
+        [NonSerialized()] Quaternion m_lastRotationUpdate;
-        Vector3 m_currentVel;
+        [NonSerialized()] Vector3 m_currentVel;
-        int m_skippedUpdates;
+        [NonSerialized()] int m_skippedUpdates;
+        [NonSerialized()] double m_lasttickMS;
        private void DoOnTimer(double tickDuration)
        {
@@ -673,7 +677,8 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    m_group.RootPart.Velocity = Vector3.Zero;
                    m_skippedUpdates = 1000;
-                    m_group.SendGroupRootTerseUpdate();
+//                    m_group.SendGroupRootTerseUpdate();
+                    m_group.RootPart.ScheduleTerseUpdate();
                }
                return;
            }
@@ -696,6 +701,8 @@ namespace OpenSim.Region.Framework.Scenes
                return;
            }
+            double nowMS = Util.GetTimeStampMS();
            if (m_frames.Count == 0)
            {
                lock (m_frames)
@@ -716,10 +723,16 @@ namespace OpenSim.Region.Framework.Scenes
                m_currentVel /= (m_currentFrame.TimeMS * 0.001f);
                m_currentFrame.TimeMS += (int)tickDuration;
+                m_lasttickMS = nowMS - 50f;
                update = true;
            }
-            m_currentFrame.TimeMS -= (int)tickDuration;
+            int elapsed = (int)(nowMS - m_lasttickMS);
+            if( elapsed > 3 * tickDuration)
+                elapsed = (int)tickDuration;
+            m_currentFrame.TimeMS -= elapsed;
+            m_lasttickMS = nowMS;
            // Do the frame processing
            double remainingSteps = (double)m_currentFrame.TimeMS / tickDuration;
@@ -752,7 +765,8 @@ namespace OpenSim.Region.Framework.Scenes
            }
            else
            {
-                bool lastSteps = remainingSteps < 4;
+//                bool lastSteps = remainingSteps < 4;
+        
                Vector3 currentPosition = m_group.AbsolutePosition;
                Vector3 motionThisFrame = (Vector3)m_currentFrame.Position - currentPosition;
                motionThisFrame /= (float)remainingSteps;
@@ -766,20 +780,22 @@ namespace OpenSim.Region.Framework.Scenes
                    Quaternion step = Quaternion.Slerp(m_currentFrame.StartRotation, (Quaternion)m_currentFrame.Rotation, completed);
                    step.Normalize();
                    m_group.RootPart.RotationOffset = step;
+/*
                    if (Math.Abs(step.X - m_lastRotationUpdate.X) > 0.001f
                        || Math.Abs(step.Y - m_lastRotationUpdate.Y) > 0.001f
                        || Math.Abs(step.Z - m_lastRotationUpdate.Z) > 0.001f)
                        update = true;
+*/
                }
                m_group.AbsolutePosition = m_nextPosition;
-                if(lastSteps)
+//                if(lastSteps)
-                    m_group.RootPart.Velocity = Vector3.Zero;
+//                    m_group.RootPart.Velocity = Vector3.Zero;
-                else
+//                else
                    m_group.RootPart.Velocity = m_currentVel;
+/*
                if(!update && (
-                    lastSteps ||
+//                    lastSteps ||
                    m_skippedUpdates * tickDuration > 0.5 ||
                    Math.Abs(m_nextPosition.X - currentPosition.X) > 5f ||
                    Math.Abs(m_nextPosition.Y - currentPosition.Y) > 5f ||
@@ -790,15 +806,16 @@ namespace OpenSim.Region.Framework.Scenes
                }
                else
                    m_skippedUpdates++;
+*/
-            }
+            }
-            if(update)
+//            if(update)
-            {
+//            {
-                m_lastPosUpdate = m_nextPosition;
+//                m_lastPosUpdate = m_nextPosition;
-                m_lastRotationUpdate = m_group.GroupRotation; 
+//                m_lastRotationUpdate = m_group.GroupRotation; 
-                m_skippedUpdates = 0;
+//                m_skippedUpdates = 0;
-                m_group.SendGroupRootTerseUpdate();
+//                m_group.SendGroupRootTerseUpdate();
-            }
+                m_group.RootPart.ScheduleTerseUpdate();
+//            }
        }
        public Byte[] Serialize()
@@ -842,8 +859,8 @@ namespace OpenSim.Region.Framework.Scenes
            {
                m_group.RootPart.Velocity = Vector3.Zero;
                m_skippedUpdates = 1000;
-                m_group.SendGroupRootTerseUpdate();
+//                m_group.SendGroupRootTerseUpdate();
-//                m_group.RootPart.ScheduleTerseUpdate();
+                m_group.RootPart.ScheduleTerseUpdate();
            }
        }
@@ -855,8 +872,8 @@ namespace OpenSim.Region.Framework.Scenes
            {
                m_group.RootPart.Velocity = Vector3.Zero;
                m_skippedUpdates = 1000;
-                m_group.SendGroupRootTerseUpdate();
+//                m_group.SendGroupRootTerseUpdate();
-//                m_group.RootPart.ScheduleTerseUpdate();
+                m_group.RootPart.ScheduleTerseUpdate();
                if (m_running)
                {
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
index 8d11331..351eda3 100644
--- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
+++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
@@ -425,25 +425,25 @@ namespace OpenSim.Region.Framework.Scenes
        private void XWfloat(string name, float f)
        {
-            writer.WriteElementString(name, f.ToString(Utils.EnUsCulture));
+            writer.WriteElementString(name, f.ToString(Culture.FormatProvider));
        }
        private void XWVector(string name, Vector3 vec)
        {
            writer.WriteStartElement(name);
-            writer.WriteElementString("X", vec.X.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("X", vec.X.ToString(Culture.FormatProvider));
-            writer.WriteElementString("Y", vec.Y.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Y", vec.Y.ToString(Culture.FormatProvider));
-            writer.WriteElementString("Z", vec.Z.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Z", vec.Z.ToString(Culture.FormatProvider));
            writer.WriteEndElement();
        }
        private void XWQuat(string name, Quaternion quat)
        {
            writer.WriteStartElement(name);
-            writer.WriteElementString("X", quat.X.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("X", quat.X.ToString(Culture.FormatProvider));
-            writer.WriteElementString("Y", quat.Y.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Y", quat.Y.ToString(Culture.FormatProvider));
-            writer.WriteElementString("Z", quat.Z.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Z", quat.Z.ToString(Culture.FormatProvider));
-            writer.WriteElementString("W", quat.W.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("W", quat.W.ToString(Culture.FormatProvider));
            writer.WriteEndElement();
        }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ebef158..c06b3dd 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1651,10 +1651,11 @@ namespace OpenSim.Region.Framework.Scenes
                    physicsMS2 = (float)(tmpMS2 - tmpMS);
                    tmpMS = tmpMS2;
+/*
                    // Apply any pending avatar force input to the avatar's velocity
                    if (Frame % m_update_entitymovement == 0)
                        m_sceneGraph.UpdateScenePresenceMovement();
+*/
                    if (Frame % (m_update_coarse_locations) == 0 && !m_sendingCoarseLocations)
                    {
                        m_sendingCoarseLocations = true;
@@ -1942,7 +1943,6 @@ namespace OpenSim.Region.Framework.Scenes
        {
            if (!m_backingup)
            {
-                m_backingup = true;
                WorkManager.RunInThreadPool(o => Backup(false), null, string.Format("BackupWorker ({0})", Name));
            }
        }
@@ -1971,38 +1971,58 @@ namespace OpenSim.Region.Framework.Scenes
        {
            lock (m_returns)
            {
-                EventManager.TriggerOnBackup(SimulationDataService, forced);
+                if(m_backingup)
+                {
+                    m_log.WarnFormat("[Scene] Backup of {0} already running. New call skipped", RegionInfo.RegionName);
+                    return;
+                }
-                foreach (KeyValuePair<UUID, ReturnInfo> ret in m_returns)
+                m_backingup = true;
+                try
                {
-                    UUID transaction = UUID.Random();
+                    EventManager.TriggerOnBackup(SimulationDataService, forced);
-                    GridInstantMessage msg = new GridInstantMessage();
+                    if(m_returns.Count == 0)
-                    msg.fromAgentID = new Guid(UUID.Zero.ToString()); // From server
+                        return;
-                    msg.toAgentID = new Guid(ret.Key.ToString());
-                    msg.imSessionID = new Guid(transaction.ToString());
-                    msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
-                    msg.fromAgentName = "Server";
-                    msg.dialog = (byte)19; // Object msg
-                    msg.fromGroup = false;
-                    msg.offline = (byte)1;
-                    msg.ParentEstateID = RegionInfo.EstateSettings.ParentEstateID;
-                    msg.Position = Vector3.Zero;
-                    msg.RegionID = RegionInfo.RegionID.Guid;
-                    // We must fill in a null-terminated 'empty' string here since bytes[0] will crash viewer 3.
-                    msg.binaryBucket = Util.StringToBytes256("\0");
-                    if (ret.Value.count > 1)
-                        msg.message = string.Format("Your {0} objects were returned from {1} in region {2} due to {3}", ret.Value.count, ret.Value.location.ToString(), RegionInfo.RegionName, ret.Value.reason);
-                    else
-                        msg.message = string.Format("Your object {0} was returned from {1} in region {2} due to {3}", ret.Value.objectName, ret.Value.location.ToString(), RegionInfo.RegionName, ret.Value.reason);
                    IMessageTransferModule tr = RequestModuleInterface<IMessageTransferModule>();
-                    if (tr != null)
+                    if (tr == null)
+                        return;
+                    uint unixtime = (uint)Util.UnixTimeSinceEpoch();
+                    uint estateid =  RegionInfo.EstateSettings.ParentEstateID;
+                    Guid regionguid = RegionInfo.RegionID.Guid;
+ 
+                    foreach (KeyValuePair<UUID, ReturnInfo> ret in m_returns)
+                    {
+                        GridInstantMessage msg = new GridInstantMessage();
+                        msg.fromAgentID = Guid.Empty; // From server
+                        msg.toAgentID = ret.Key.Guid;
+                        msg.imSessionID = Guid.NewGuid();
+                        msg.timestamp = unixtime;
+                        msg.fromAgentName = "Server";
+                        msg.dialog = 19; // Object msg
+                        msg.fromGroup = false;
+                        msg.offline = 1;
+                        msg.ParentEstateID = estateid;
+                        msg.Position = Vector3.Zero;
+                        msg.RegionID = regionguid;
+                        // We must fill in a null-terminated 'empty' string here since bytes[0] will crash viewer 3.
+                        msg.binaryBucket = new Byte[1] {0};
+                        if (ret.Value.count > 1)
+                            msg.message = string.Format("Your {0} objects were returned from {1} in region {2} due to {3}", ret.Value.count, ret.Value.location.ToString(), RegionInfo.RegionName, ret.Value.reason);
+                        else
+                            msg.message = string.Format("Your object {0} was returned from {1} in region {2} due to {3}", ret.Value.objectName, ret.Value.location.ToString(), RegionInfo.RegionName, ret.Value.reason);
                        tr.SendInstantMessage(msg, delegate(bool success) { });
+                    }
+                    m_returns.Clear();
+                }
+                finally
+                {
+                    m_backingup = false;
                }
-                m_returns.Clear();
-                m_backingup = false;
            }
        }
@@ -4805,16 +4825,34 @@ Label_GroupsDone:
        public void RequestTeleportLocation(IClientAPI remoteClient, string regionName, Vector3 position,
                                            Vector3 lookat, uint teleportFlags)
        {
-            GridRegion region = GridService.GetRegionByName(RegionInfo.ScopeID, regionName);
+            if (EntityTransferModule == null)
+            {
+                m_log.DebugFormat("[SCENE]: Unable to perform teleports: no AgentTransferModule is active");
+                return;
+            }
+            ScenePresence sp = GetScenePresence(remoteClient.AgentId);
+            if (sp == null || sp.IsDeleted || sp.IsInTransit)
+                return;
-            if (region == null)
+            ulong regionHandle = 0;
+            if(regionName == RegionInfo.RegionName)
+                regionHandle = RegionInfo.RegionHandle;
+            else
+            {
+                GridRegion region = GridService.GetRegionByName(RegionInfo.ScopeID, regionName);
+                if (region != null)
+                    regionHandle = region.RegionHandle;
+            }
+            if(regionHandle == 0)
            {
                // can't find the region: Tell viewer and abort
                remoteClient.SendTeleportFailed("The region '" + regionName + "' could not be found.");
                return;
            }
-            RequestTeleportLocation(remoteClient, region.RegionHandle, position, lookat, teleportFlags);
+            EntityTransferModule.Teleport(sp, regionHandle, position, lookat, teleportFlags);
        }
        /// <summary>
@@ -4828,19 +4866,17 @@ Label_GroupsDone:
        public void RequestTeleportLocation(IClientAPI remoteClient, ulong regionHandle, Vector3 position,
                                            Vector3 lookAt, uint teleportFlags)
        {
-            ScenePresence sp = GetScenePresence(remoteClient.AgentId);
+            if (EntityTransferModule == null)
-            if (sp != null)
            {
-                if (EntityTransferModule != null)
+                m_log.DebugFormat("[SCENE]: Unable to perform teleports: no AgentTransferModule is active");
-                {
+                return;
-                    EntityTransferModule.Teleport(sp, regionHandle, position, lookAt, teleportFlags);
-                }
-                else
-                {
-                    m_log.DebugFormat("[SCENE]: Unable to perform teleports: no AgentTransferModule is active");
-                    sp.ControllingClient.SendTeleportFailed("Unable to perform teleports on this simulator.");
-                }
            }
+            ScenePresence sp = GetScenePresence(remoteClient.AgentId);
+            if (sp == null || sp.IsDeleted || sp.IsInTransit)
+                return;
+            EntityTransferModule.Teleport(sp, regionHandle, position, lookAt, teleportFlags);
        }
        public bool CrossAgentToNewRegion(ScenePresence agent, bool isFlying)
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index ae827f4..61a243d 100755
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1649,7 +1649,7 @@ namespace OpenSim.Region.Framework.Scenes
                        else // else turn it off
                            vdtc = false;
-                        group.UpdatePrimFlags(localID, UsePhysics, SetTemporary, SetPhantom, vdtc);
+                        group.UpdateFlags(UsePhysics, SetTemporary, SetPhantom, vdtc);
                    }
                    else
                    {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index fdfe8ae..6f46a92 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1259,6 +1259,8 @@ namespace OpenSim.Region.Framework.Scenes
            set { m_LoopSoundSlavePrims = value; }
        }
+        private double m_lastCollisionSoundMS;
+        
        /// <summary>
        /// The UUID for the region this object is in.
        /// </summary>
@@ -1336,7 +1338,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        public SceneObjectGroup()
        {
+            m_lastCollisionSoundMS = Util.GetTimeStampMS() + 1000.0;
        }
        /// <summary>
@@ -2716,35 +2718,22 @@ namespace OpenSim.Region.Framework.Scenes
                    RootPart.KeyframeMotion.Stop();
                RootPart.KeyframeMotion = null;
            }
-            UpdatePrimFlags(RootPart.LocalId, usePhysics, IsTemporary, IsPhantom, IsVolumeDetect);
+            UpdateFlags(usePhysics, IsTemporary, IsPhantom, IsVolumeDetect);
        }
        public void ScriptSetTemporaryStatus(bool makeTemporary)
        {
-            UpdatePrimFlags(RootPart.LocalId, UsesPhysics, makeTemporary, IsPhantom, IsVolumeDetect);
+            UpdateFlags(UsesPhysics, makeTemporary, IsPhantom, IsVolumeDetect);
        }
        public void ScriptSetPhantomStatus(bool makePhantom)
        {
-            UpdatePrimFlags(RootPart.LocalId, UsesPhysics, IsTemporary, makePhantom, IsVolumeDetect);
+            UpdateFlags(UsesPhysics, IsTemporary, makePhantom, IsVolumeDetect);
        }
        public void ScriptSetVolumeDetect(bool makeVolumeDetect)
        {
-            UpdatePrimFlags(RootPart.LocalId, UsesPhysics, IsTemporary, IsPhantom, makeVolumeDetect);
+            UpdateFlags(UsesPhysics, IsTemporary, IsPhantom, makeVolumeDetect);
-            /*
-            ScriptSetPhantomStatus(false);  // What ever it was before, now it's not phantom anymore
-            if (PhysActor != null) // Should always be the case now
-            {
-                PhysActor.SetVolumeDetect(param);
-            }
-            if (param != 0)
-                AddFlag(PrimFlags.Phantom);
-            ScheduleFullUpdate();
-            */
        }
        public void applyImpulse(Vector3 impulse)
@@ -4029,84 +4018,80 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="SetTemporary"></param>
        /// <param name="SetPhantom"></param>
        /// <param name="SetVolumeDetect"></param>
-        public void UpdatePrimFlags(uint localID, bool UsePhysics, bool SetTemporary, bool SetPhantom, bool SetVolumeDetect)
+        public void UpdateFlags(bool UsePhysics, bool SetTemporary, bool SetPhantom, bool SetVolumeDetect)
        {
-            HasGroupChanged = true;
+            if (m_scene == null || IsDeleted)
+                return;
-            SceneObjectPart selectionPart = GetPart(localID);
+            HasGroupChanged = true;
-            if (Scene != null)
+            if (SetTemporary)
            {
-                if (SetTemporary)
+                DetachFromBackup();
-                {
+                // Remove from database and parcel prim count
-                    DetachFromBackup();
+                //
-                    // Remove from database and parcel prim count
+                m_scene.DeleteFromStorage(UUID);
-                    //
-                    m_scene.DeleteFromStorage(UUID);
-                }
-                else if (!Backup)
-                {
-                    // Previously been temporary now switching back so make it
-                    // available for persisting again
-                    AttachToBackup();
-                }
-                m_scene.EventManager.TriggerParcelPrimCountTainted();
            }
+            else if (!Backup)
-            if (selectionPart != null)
            {
-                SceneObjectPart[] parts = m_parts.GetArray();
+                // Previously been temporary now switching back so make it
+                // available for persisting again
+                AttachToBackup();
+            }
-                if (Scene != null && UsePhysics)
-                {
-                    int maxprims = m_scene.m_linksetPhysCapacity;
-                    bool checkShape = (maxprims > 0 &&
-                             parts.Length > maxprims);
-                    for (int i = 0; i < parts.Length; i++)
+            SceneObjectPart[] parts = m_parts.GetArray();
-                    {
-                        SceneObjectPart part = parts[i];
+            if (UsePhysics)
+            {
+                int maxprims = m_scene.m_linksetPhysCapacity;
+                bool checkShape = (maxprims > 0 &&
+                            parts.Length > maxprims);
-                        if(part.PhysicsShapeType == (byte)PhysicsShapeType.None)
+                for (int i = 0; i < parts.Length; i++)
-                            continue; // assuming root type was checked elsewhere
+                {
+                    SceneObjectPart part = parts[i];
-                        if (checkShape)
+                    if(part.PhysicsShapeType == (byte)PhysicsShapeType.None)
-                        {
+                        continue; // assuming root type was checked elsewhere
-                            if (--maxprims < 0)
-                            {
-                                UsePhysics = false;
-                                break;
-                            }
-                        }
-                        if (part.Scale.X > m_scene.m_maxPhys ||
+                    if (checkShape)
-                            part.Scale.Y > m_scene.m_maxPhys ||
+                    {
-                            part.Scale.Z > m_scene.m_maxPhys )
+                        if (--maxprims < 0)
                        {
-                            UsePhysics = false; // Reset physics
+                            UsePhysics = false;
                            break;
                        }
                    }
-                }
-                if (parts.Length > 1)
-                {
-                    m_rootPart.UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect, true);
-                    for (int i = 0; i < parts.Length; i++)
+                    if (part.Scale.X > m_scene.m_maxPhys ||
+                        part.Scale.Y > m_scene.m_maxPhys ||
+                        part.Scale.Z > m_scene.m_maxPhys )
                    {
+                        UsePhysics = false; // Reset physics
-                        if (parts[i].UUID != m_rootPart.UUID)
+                        break;
-                            parts[i].UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect, true);
                    }
+                }
+            }
+            if (parts.Length > 1)
+            {
+                m_rootPart.UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect, true);
-                    if (m_rootPart.PhysActor != null)
+                for (int i = 0; i < parts.Length; i++)
-                        m_rootPart.PhysActor.Building = false;
+                {
+                    if (parts[i].UUID != m_rootPart.UUID)
+                        parts[i].UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect, true);
                }
-                else
-                    m_rootPart.UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect, false);
+                if (m_rootPart.PhysActor != null)
+                    m_rootPart.PhysActor.Building = false;
            }
+            else
+                m_rootPart.UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect, false);
+            m_scene.EventManager.TriggerParcelPrimCountTainted();
        }
        public void UpdateExtraParam(uint localID, ushort type, bool inUse, byte[] data)
@@ -5528,7 +5513,33 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
+        public bool CollisionSoundThrottled(int collisionSoundType)
+        {
+            double time = m_lastCollisionSoundMS;
+//            m_lastCollisionSoundMS = Util.GetTimeStampMS();
+//            time = m_lastCollisionSoundMS - time;
+            double now  = Util.GetTimeStampMS();
+            time = now - time;
+            switch (collisionSoundType)
+            {
+                case 0: // default sounds
+                case 2: // default sounds with volume set by script
+                    if(time < 300.0)                    
+                        return true;
+                    break;
+                case 1: // selected sound
+                    if(time < 200.0)                    
+                        return true;
+                    break;
+                default:
+                    break;
+            }
+            m_lastCollisionSoundMS = now;
+            return false;
+        }
        #endregion
    }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index c2eac24..f0a3fab 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -329,7 +329,8 @@ namespace OpenSim.Region.Framework.Scenes
        private byte[] m_TextureAnimation;
        private byte m_clickAction;
        private Color m_color = Color.Black;
-        private readonly List<uint> m_lastColliders = new List<uint>();
+        private List<uint> m_lastColliders = new List<uint>();
+        private bool m_lastLandCollide;
        private int m_linkNum;
        private int m_scriptAccessPin;
@@ -369,9 +370,9 @@ namespace OpenSim.Region.Framework.Scenes
        protected Vector3 m_lastPosition;
        protected Quaternion m_lastRotation;
        protected Vector3 m_lastVelocity;
-        protected Vector3 m_lastAcceleration;
+        protected Vector3 m_lastAcceleration; // acceleration is a derived var with high noise
        protected Vector3 m_lastAngularVelocity;
-        protected int m_lastUpdateSentTime;
+        protected double m_lastUpdateSentTime;
        protected float m_buoyancy = 0.0f;
        protected Vector3 m_force;
        protected Vector3 m_torque;
@@ -809,7 +810,7 @@ namespace OpenSim.Region.Framework.Scenes
            {
                // If this is a linkset, we don't want the physics engine mucking up our group position here.
                PhysicsActor actor = PhysActor;
-                if (ParentID == 0)
+                if (_parentID == 0)
                {
                    if (actor != null)
                        m_groupPosition = actor.Position;
@@ -838,7 +839,7 @@ namespace OpenSim.Region.Framework.Scenes
                    try
                    {
                        // Root prim actually goes at Position
-                        if (ParentID == 0)
+                        if (_parentID == 0)
                        {
                            actor.Position = value;
                        }
@@ -880,7 +881,7 @@ namespace OpenSim.Region.Framework.Scenes
                        ParentGroup.InvalidBoundsRadius();
                    PhysicsActor actor = PhysActor;
-                    if (ParentID != 0 && actor != null)
+                    if (_parentID != 0 && actor != null)
                    {
                        actor.Position = GetWorldPosition();
                        actor.Orientation = GetWorldRotation();
@@ -940,7 +941,7 @@ namespace OpenSim.Region.Framework.Scenes
                PhysicsActor actor = PhysActor;
                // If this is a root of a linkset, the real rotation is what the physics engine thinks.
                // If not a root prim, the offset rotation is computed by SOG and is relative to the root.
-                if (ParentID == 0 && (Shape.PCode != 9 || Shape.State == 0) && actor != null)
+                if (_parentID == 0 && (Shape.PCode != 9 || Shape.State == 0) && actor != null)
                    m_rotationOffset = actor.Orientation;
                return m_rotationOffset;
@@ -957,7 +958,7 @@ namespace OpenSim.Region.Framework.Scenes
                    try
                    {
                        // Root prim gets value directly
-                        if (ParentID == 0)
+                        if (_parentID == 0)
                        {
                            actor.Orientation = value;
                            //m_log.Info("[PART]: RO1:" + actor.Orientation.ToString());
@@ -1103,8 +1104,8 @@ namespace OpenSim.Region.Framework.Scenes
        {
            get
            {
-                if (m_text.Length > 255)
+                if (m_text.Length > 256) // yes > 254
-                    return m_text.Substring(0, 254);
+                    return m_text.Substring(0, 256);
                return m_text;
            }
            set { m_text = value; }
@@ -1258,6 +1259,9 @@ namespace OpenSim.Region.Framework.Scenes
        {
            get
            {
+                if (_parentID == 0)
+                    return GroupPosition;
                return GroupPosition + (m_offsetPosition * ParentGroup.RootPart.RotationOffset);
            }
        }
@@ -1379,7 +1383,8 @@ namespace OpenSim.Region.Framework.Scenes
        public UUID LastOwnerID
        {
            get { return _lastOwnerID; }
-            set { _lastOwnerID = value; }
+            set {
+             _lastOwnerID = value; }
        }
        public UUID RezzerID
@@ -2422,7 +2427,7 @@ namespace OpenSim.Region.Framework.Scenes
                            PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
                            PhysActor.OnOutOfBounds += PhysicsOutOfBounds;
-                            if (ParentID != 0 && ParentID != LocalId)
+                            if (_parentID != 0 && _parentID != LocalId)
                            {
                                PhysicsActor parentPa = ParentGroup.RootPart.PhysActor;
@@ -2788,12 +2793,13 @@ namespace OpenSim.Region.Framework.Scenes
        {
            ColliderArgs colliderArgs = new ColliderArgs();
            List<DetectedObject> colliding = new List<DetectedObject>();
+            Scene parentScene = ParentGroup.Scene;
            foreach (uint localId in colliders)
            {
                if (localId == 0)
                    continue;
-                SceneObjectPart obj = ParentGroup.Scene.GetSceneObjectPart(localId);
+                SceneObjectPart obj = parentScene.GetSceneObjectPart(localId);
                if (obj != null)
                {
                    if (!dest.CollisionFilteredOut(obj.UUID, obj.Name))
@@ -2801,7 +2807,7 @@ namespace OpenSim.Region.Framework.Scenes
                }
                else
                {
-                    ScenePresence av = ParentGroup.Scene.GetScenePresence(localId);
+                    ScenePresence av = parentScene.GetScenePresence(localId);
                    if (av != null && (!av.IsChildAgent))
                    {
                        if (!dest.CollisionFilteredOut(av.UUID, av.Name))
@@ -2874,10 +2880,13 @@ namespace OpenSim.Region.Framework.Scenes
        public void PhysicsCollision(EventArgs e)
        {
-            if (ParentGroup.Scene == null || ParentGroup.IsDeleted)
+            if (ParentGroup.Scene == null || ParentGroup.IsDeleted || ParentGroup.inTransit)
                return;
            // this a thread from physics ( heartbeat )
+            bool thisHitLand = false;
+            bool startLand = false;
+            bool endedLand = false;
            CollisionEventUpdate a = (CollisionEventUpdate)e;
            Dictionary<uint, ContactPoint> collissionswith = a.m_objCollisionList;
@@ -2887,13 +2896,17 @@ namespace OpenSim.Region.Framework.Scenes
            if (collissionswith.Count == 0)
            {
-                if (m_lastColliders.Count == 0)
+                if (m_lastColliders.Count == 0 && !m_lastLandCollide)
                    return; // nothing to do
+                endedLand = m_lastLandCollide;
+                m_lastLandCollide = false;
                foreach (uint localID in m_lastColliders)
                {
                    endedColliders.Add(localID);
                }
                m_lastColliders.Clear();
            }
            else
@@ -2909,19 +2922,39 @@ namespace OpenSim.Region.Framework.Scenes
                    foreach (uint id in collissionswith.Keys)
                    {
-                        thisHitColliders.Add(id);
+                        if(id == 0)
-                        if (!m_lastColliders.Contains(id))
                        {
-                            startedColliders.Add(id);
+                            thisHitLand = true;
+                            if (!m_lastLandCollide)
-                            curcontact = collissionswith[id];
+                            {
-                            if (Math.Abs(curcontact.RelativeSpeed) > 0.2)
+                                startLand = true;
+                                curcontact = collissionswith[id];
+                                if (Math.Abs(curcontact.RelativeSpeed) > 0.2)
+                                {
+                                    soundinfo = new CollisionForSoundInfo();
+                                    soundinfo.colliderID = id;
+                                    soundinfo.position = curcontact.Position;
+                                    soundinfo.relativeVel = curcontact.RelativeSpeed;
+                                    soundinfolist.Add(soundinfo);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            thisHitColliders.Add(id);
+                            if (!m_lastColliders.Contains(id))
                            {
-                                soundinfo = new CollisionForSoundInfo();
+                                startedColliders.Add(id);
-                                soundinfo.colliderID = id;
-                                soundinfo.position = curcontact.Position;
+                                curcontact = collissionswith[id];
-                                soundinfo.relativeVel = curcontact.RelativeSpeed;
+                                if (Math.Abs(curcontact.RelativeSpeed) > 0.2)
-                                soundinfolist.Add(soundinfo);
+                                {
+                                    soundinfo = new CollisionForSoundInfo();
+                                    soundinfo.colliderID = id;
+                                    soundinfo.position = curcontact.Position;
+                                    soundinfo.relativeVel = curcontact.RelativeSpeed;
+                                    soundinfolist.Add(soundinfo);
+                                }
                            }
                        }
                    }
@@ -2930,9 +2963,18 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    foreach (uint id in collissionswith.Keys)
                    {
-                        thisHitColliders.Add(id);
+                        if(id == 0)
-                        if (!m_lastColliders.Contains(id))
+                        {
-                            startedColliders.Add(id);
+                            thisHitLand = true;
+                            if (!m_lastLandCollide)
+                                startLand = true;
+                        }
+                        else
+                        {
+                            thisHitColliders.Add(id);
+                            if (!m_lastColliders.Contains(id))
+                                startedColliders.Add(id);
+                        }
                    }
                }
@@ -2951,22 +2993,32 @@ namespace OpenSim.Region.Framework.Scenes
                foreach (uint localID in endedColliders)
                    m_lastColliders.Remove(localID);
+                if(m_lastLandCollide && !thisHitLand)
+                    endedLand = true;
+                m_lastLandCollide = thisHitLand;
                // play sounds.
                if (soundinfolist.Count > 0)
                    CollisionSounds.PartCollisionSound(this, soundinfolist);
            }
+            
+            EventManager eventmanager = ParentGroup.Scene.EventManager;
-            SendCollisionEvent(scriptEvents.collision_start, startedColliders, ParentGroup.Scene.EventManager.TriggerScriptCollidingStart);
+            SendCollisionEvent(scriptEvents.collision_start, startedColliders, eventmanager.TriggerScriptCollidingStart);
            if (!VolumeDetectActive)
-                SendCollisionEvent(scriptEvents.collision  , m_lastColliders , ParentGroup.Scene.EventManager.TriggerScriptColliding);
+                SendCollisionEvent(scriptEvents.collision  , m_lastColliders , eventmanager.TriggerScriptColliding);
-            SendCollisionEvent(scriptEvents.collision_end  , endedColliders  , ParentGroup.Scene.EventManager.TriggerScriptCollidingEnd);
+            SendCollisionEvent(scriptEvents.collision_end  , endedColliders  , eventmanager.TriggerScriptCollidingEnd);
-            if (startedColliders.Contains(0))
+            if (!VolumeDetectActive)
-                SendLandCollisionEvent(scriptEvents.land_collision_start, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingStart);
+            {
-            if (m_lastColliders.Contains(0))
+                if (startLand)
-                SendLandCollisionEvent(scriptEvents.land_collision, ParentGroup.Scene.EventManager.TriggerScriptLandColliding);
+                    SendLandCollisionEvent(scriptEvents.land_collision_start, eventmanager.TriggerScriptLandCollidingStart);
-            if (endedColliders.Contains(0))
+                if (m_lastLandCollide)
-                SendLandCollisionEvent(scriptEvents.land_collision_end, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingEnd);
+                    SendLandCollisionEvent(scriptEvents.land_collision, eventmanager.TriggerScriptLandColliding);
+                if (endedLand)
+                    SendLandCollisionEvent(scriptEvents.land_collision_end, eventmanager.TriggerScriptLandCollidingEnd);
+            }
        }
        // The Collision sounds code calls this
@@ -2985,7 +3037,7 @@ namespace OpenSim.Region.Framework.Scenes
                volume = 0;
            int now = Util.EnvironmentTickCount();
-            if(Util.EnvironmentTickCountSubtract(now,LastColSoundSentTime) <200)
+            if(Util.EnvironmentTickCountSubtract(now, LastColSoundSentTime) < 200)
                return;
            LastColSoundSentTime = now;
@@ -3026,7 +3078,7 @@ namespace OpenSim.Region.Framework.Scenes
                //ParentGroup.RootPart.m_groupPosition = newpos;
            }
 /*
-            if (pa != null && ParentID != 0 && ParentGroup != null)
+            if (pa != null && _parentID != 0 && ParentGroup != null)
            {
                // Special case where a child object is requesting property updates.
                // This happens when linksets are modified to use flexible links rather than
@@ -3236,7 +3288,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <summary>
        /// Schedule a terse update for this prim.  Terse updates only send position,
-        /// rotation, velocity and rotational velocity information.
+        /// rotation, velocity and rotational velocity information. WRONG!!!!
        /// </summary>
        public void ScheduleTerseUpdate()
        {
@@ -3295,21 +3347,6 @@ namespace OpenSim.Region.Framework.Scenes
                    sp.SendAttachmentUpdate(this, UpdateRequired.FULL);
                }
            }
-/* this does nothing
-SendFullUpdateToClient(remoteClient, Position) ignores position parameter
-            if (IsRoot)
-            {
-                if (ParentGroup.IsAttachment)
-                {
-                    SendFullUpdateToClient(remoteClient, AttachedPos);
-                }
-                else
-                {
-                    SendFullUpdateToClient(remoteClient, AbsolutePosition);
-                }
-            }
-*/
            else
            {
                SendFullUpdateToClient(remoteClient);
@@ -3325,12 +3362,12 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                return;
            // Update the "last" values
-            m_lastPosition = OffsetPosition;
+            m_lastPosition = AbsolutePosition;
            m_lastRotation = RotationOffset;
            m_lastVelocity = Velocity;
            m_lastAcceleration = Acceleration;
            m_lastAngularVelocity = AngularVelocity;
-            m_lastUpdateSentTime = Environment.TickCount;
+            m_lastUpdateSentTime = Util.GetTimeStampMS();
            ParentGroup.Scene.ForEachScenePresence(delegate(ScenePresence avatar)
            {
@@ -3344,12 +3381,12 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                return;
            // Update the "last" values
-            m_lastPosition = OffsetPosition;
+            m_lastPosition = AbsolutePosition;
            m_lastRotation = RotationOffset;
            m_lastVelocity = Velocity;
            m_lastAcceleration = Acceleration;
            m_lastAngularVelocity = AngularVelocity;
-            m_lastUpdateSentTime = Environment.TickCount;
+            m_lastUpdateSentTime = Util.GetTimeStampMS();
            if (ParentGroup.IsAttachment)
            {
@@ -3395,40 +3432,129 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
            ParentGroup.Scene.StatsReporter.AddObjectUpdates(1);
        }
+        private const float ROTATION_TOLERANCE = 0.01f;
+        private const float VELOCITY_TOLERANCE = 0.1f; // terse update vel has low resolution
+        private const float POSITION_TOLERANCE = 0.05f; // I don't like this, but I suppose it's necessary
+        private const double TIME_MS_TOLERANCE = 200f; //llSetPos has a 200ms delay. This should NOT be 3 seconds.
+        
        /// <summary>
        /// Tell all the prims which have had updates scheduled
        /// </summary>
        public void SendScheduledUpdates()
-        {
+        {           
-            const float ROTATION_TOLERANCE = 0.01f;
-            const float VELOCITY_TOLERANCE = 0.001f;
-            const float POSITION_TOLERANCE = 0.05f; // I don't like this, but I suppose it's necessary
-            const int TIME_MS_TOLERANCE = 200; //llSetPos has a 200ms delay. This should NOT be 3 seconds.
            switch (UpdateFlag)
            {
+                case UpdateRequired.NONE:
+                    ClearUpdateSchedule();
+                    break;
                case UpdateRequired.TERSE:
-                {
                    ClearUpdateSchedule();
-                    // Throw away duplicate or insignificant updates
+                    bool needupdate = true;
-                    if (!RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) ||
+                    double now = Util.GetTimeStampMS();
-                        !Acceleration.Equals(m_lastAcceleration) ||
+                    Vector3 curvel = Velocity;
-                        !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) ||
+                    Vector3 curacc = Acceleration;
-                        Velocity.ApproxEquals(Vector3.Zero, VELOCITY_TOLERANCE) ||
+                    Vector3 angvel = AngularVelocity;
-                        !AngularVelocity.ApproxEquals(m_lastAngularVelocity, VELOCITY_TOLERANCE) ||
-                        !OffsetPosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) ||
+                    while(true) // just to avoid ugly goto
-                        Environment.TickCount - m_lastUpdateSentTime > TIME_MS_TOLERANCE)
+                    {
+                        double elapsed = now - m_lastUpdateSentTime;
+                        if (elapsed > TIME_MS_TOLERANCE)
+                            break;
+                        if( Math.Abs(curacc.X - m_lastAcceleration.X) >  VELOCITY_TOLERANCE ||
+                            Math.Abs(curacc.Y - m_lastAcceleration.Y) >  VELOCITY_TOLERANCE ||
+                            Math.Abs(curacc.Z - m_lastAcceleration.Z) >  VELOCITY_TOLERANCE)
+                            break;
+                        // velocity change is also direction not only norm)
+                        if( Math.Abs(curvel.X - m_lastVelocity.X) >  VELOCITY_TOLERANCE ||
+                            Math.Abs(curvel.Y - m_lastVelocity.Y) >  VELOCITY_TOLERANCE ||
+                            Math.Abs(curvel.Z - m_lastVelocity.Z) >  VELOCITY_TOLERANCE)
+                            break;
+                        
+                        float vx = Math.Abs(curvel.X);
+                        if(vx > 128.0)
+                            break;
+                        float vy = Math.Abs(curvel.Y);
+                        if(vy > 128.0)
+                            break;
+                        float vz = Math.Abs(curvel.Z);
+                        if(vz > 128.0)
+                            break;
+                        if (
+                            vx <  VELOCITY_TOLERANCE &&
+                            vy <  VELOCITY_TOLERANCE &&
+                            vz <  VELOCITY_TOLERANCE
+                            )
+                        {
+                            if(!AbsolutePosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE))
+                                break;
+                            
+                            if (vx <  1e-4 &&
+                                vy <  1e-4 &&
+                                vz <  1e-4 &&
+                                (
+                                    Math.Abs(m_lastVelocity.X) > 1e-4 ||
+                                    Math.Abs(m_lastVelocity.Y) > 1e-4 ||
+                                    Math.Abs(m_lastVelocity.Z) > 1e-4
+                                ))
+                                break;
+                        }
+                        if( Math.Abs(angvel.X - m_lastAngularVelocity.X) >  VELOCITY_TOLERANCE ||
+                            Math.Abs(angvel.Y - m_lastAngularVelocity.Y) >  VELOCITY_TOLERANCE ||
+                            Math.Abs(angvel.Z - m_lastAngularVelocity.Z) >  VELOCITY_TOLERANCE)
+                            break;
+                        // viewer interpolators have a limit of 128m/s
+                        float ax = Math.Abs(angvel.X);
+                        if(ax > 64.0)
+                            break;
+                        float ay = Math.Abs(angvel.Y);
+                        if(ay > 64.0)
+                            break;
+                        float az = Math.Abs(angvel.Z);
+                        if(az > 64.0)
+                            break;
+                        if (
+                            ax <  VELOCITY_TOLERANCE &&
+                            ay <  VELOCITY_TOLERANCE &&
+                            az <  VELOCITY_TOLERANCE &&
+                            !RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE)
+                            )
+                          break;
+                        needupdate = false;
+                        break;
+                    }
+                    if(needupdate)
                    {
-                        SendTerseUpdateToAllClientsInternal();
+                        // Update the "last" values
+                        m_lastPosition = AbsolutePosition;
+                        m_lastRotation = RotationOffset;
+                        m_lastVelocity = curvel;
+                        m_lastAcceleration = curacc;
+                        m_lastAngularVelocity = angvel;
+                        m_lastUpdateSentTime = now;
+                        ParentGroup.Scene.ForEachClient(delegate(IClientAPI client)
+                        {
+                            SendTerseUpdateToClient(client);
+                        });
                    }
                    break;
-                }
                case UpdateRequired.FULL:
-                {
                    ClearUpdateSchedule();
                    SendFullUpdateToAllClientsInternal();
                    break;
-                }
            }
        }
@@ -3441,13 +3567,15 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
            if (ParentGroup == null || ParentGroup.Scene == null)
                return;
+            ClearUpdateSchedule();
            // Update the "last" values
-            m_lastPosition = OffsetPosition;
+            m_lastPosition = AbsolutePosition;
            m_lastRotation = RotationOffset;
            m_lastVelocity = Velocity;
            m_lastAcceleration = Acceleration;
            m_lastAngularVelocity = AngularVelocity;
-            m_lastUpdateSentTime = Environment.TickCount;
+            m_lastUpdateSentTime = Util.GetTimeStampMS();
            ParentGroup.Scene.ForEachClient(delegate(IClientAPI client)
            {
@@ -3460,13 +3588,15 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
            if (ParentGroup == null || ParentGroup.Scene == null)
                return;
+            ClearUpdateSchedule();
            // Update the "last" values
-            m_lastPosition = OffsetPosition;
+            m_lastPosition = AbsolutePosition;
            m_lastRotation = RotationOffset;
            m_lastVelocity = Velocity;
            m_lastAcceleration = Acceleration;
            m_lastAngularVelocity = AngularVelocity;
-            m_lastUpdateSentTime = Environment.TickCount;
+            m_lastUpdateSentTime = Util.GetTimeStampMS();
            if (ParentGroup.IsAttachment)
            {
@@ -4783,7 +4913,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
                    pa.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
                    pa.OnOutOfBounds += PhysicsOutOfBounds;
-                    if (ParentID != 0 && ParentID != LocalId)
+                    if (_parentID != 0 && _parentID != LocalId)
                    {
                        PhysicsActor parentPa = ParentGroup.RootPart.PhysActor;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7e3adb9..ba3aaae 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -279,8 +279,11 @@ namespace OpenSim.Region.Framework.Scenes
        private bool MouseDown = false;
        public Vector3 lastKnownAllowedPosition;
        public bool sentMessageAboutRestrictedParcelFlyingDown;
        public Vector4 CollisionPlane = Vector4.UnitW;
+        public Vector4 m_lastCollisionPlane = Vector4.UnitW;
+        private byte m_lastState;
        private Vector3 m_lastPosition;
        private Quaternion m_lastRotation;
        private Vector3 m_lastVelocity;
@@ -2818,16 +2821,13 @@ namespace OpenSim.Region.Framework.Scenes
            CameraAtAxis = agentData.CameraAtAxis;
            CameraLeftAxis = agentData.CameraLeftAxis;
            CameraUpAxis = agentData.CameraUpAxis;
-            Quaternion camRot = Util.Axes2Rot(CameraAtAxis, CameraLeftAxis, CameraUpAxis);
-            CameraRotation = camRot;
-            // The Agent's Draw distance setting
-            // When we get to the point of re-computing neighbors everytime this
-            // changes, then start using the agent's drawdistance rather than the
-            // region's draw distance.
            DrawDistance = agentData.Far;
+            CameraAtAxis.Normalize();
+            CameraLeftAxis.Normalize();
+            CameraUpAxis.Normalize();
+            Quaternion camRot = Util.Axes2Rot(CameraAtAxis, CameraLeftAxis, CameraUpAxis);
+            CameraRotation = camRot;
            // Check if Client has camera in 'follow cam' or 'build' mode.
 //            Vector3 camdif = (Vector3.One * Rotation - Vector3.One * CameraRotation);
@@ -3789,29 +3789,21 @@ namespace OpenSim.Region.Framework.Scenes
            // Send terse position update if not sitting and position, velocity, or rotation
            //      has changed significantly from last sent update
-            if (!IsSatOnObject && (
-                        !Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE)
-                        || !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE)
-                        || !m_pos.ApproxEquals(m_lastPosition, POSITION_LARGETOLERANCE)
-                        // if velocity is zero and it wasn't zero last time, send the update
-                        || (Velocity == Vector3.Zero && m_lastVelocity != Vector3.Zero)
-                        // if position has moved just a little and velocity is very low, send  the update
-                        || (!m_pos.ApproxEquals(m_lastPosition, POSITION_SMALLTOLERANCE) && Velocity.LengthSquared() < LOWVELOCITYSQ )
-                ) )
-            {
-/*
            if (!IsSatOnObject)
            {
                // this does need to be more complex later
                Vector3 vel = Velocity;
                Vector3 dpos = m_pos - m_lastPosition;
-                if(     Math.Abs(vel.X - m_lastVelocity.X) > VELOCITY_TOLERANCE ||
+                if(     State != m_lastState ||
+                        Math.Abs(vel.X - m_lastVelocity.X) > VELOCITY_TOLERANCE ||
                        Math.Abs(vel.Y - m_lastVelocity.Y) > VELOCITY_TOLERANCE ||
                        Math.Abs(vel.Z - m_lastVelocity.Z) > VELOCITY_TOLERANCE ||
                        Math.Abs(m_bodyRot.X - m_lastRotation.X) > ROTATION_TOLERANCE ||
                        Math.Abs(m_bodyRot.Y - m_lastRotation.Y) > ROTATION_TOLERANCE ||
                        Math.Abs(m_bodyRot.Z - m_lastRotation.Z) > ROTATION_TOLERANCE ||
+                       
+                        (vel ==  Vector3.Zero && m_lastVelocity != Vector3.Zero) ||
                        Math.Abs(dpos.X) > POSITION_LARGETOLERANCE ||
                        Math.Abs(dpos.Y) > POSITION_LARGETOLERANCE ||
@@ -3821,11 +3813,15 @@ namespace OpenSim.Region.Framework.Scenes
                            Math.Abs(dpos.Y) > POSITION_SMALLTOLERANCE ||
                            Math.Abs(dpos.Z) > POSITION_SMALLTOLERANCE)
                            && vel.LengthSquared() < LOWVELOCITYSQ
-                        ))
+                        ) ||
+                        Math.Abs(CollisionPlane.X - m_lastCollisionPlane.X) > POSITION_SMALLTOLERANCE ||
+                        Math.Abs(CollisionPlane.Y - m_lastCollisionPlane.Y) > POSITION_SMALLTOLERANCE ||
+                        Math.Abs(CollisionPlane.W - m_lastCollisionPlane.W) > POSITION_SMALLTOLERANCE
+                        )
                {
-*/
                    SendTerseUpdateToAllClients();
-//                }
+                }
            }
            CheckForSignificantMovement();
        }
@@ -3921,11 +3917,14 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        public void SendTerseUpdateToAllClients()
        {
-            m_scene.ForEachScenePresence(SendTerseUpdateToAgent);
+            m_lastState = State;
-            // Update the "last" values
            m_lastPosition = m_pos;
            m_lastRotation = m_bodyRot;
            m_lastVelocity = Velocity;
+            m_lastCollisionPlane = CollisionPlane;
+            m_scene.ForEachScenePresence(SendTerseUpdateToAgent);
+            // Update the "last" values
            TriggerScenePresenceUpdated();
        }
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index 7f7977e..41f3ef4 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -86,9 +86,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                    writer.WriteStartElement("CoalescedObject");
-                    writer.WriteAttributeString("x", size.X.ToString());
+                    writer.WriteAttributeString("x", size.X.ToString(Culture.FormatProvider));
-                    writer.WriteAttributeString("y", size.Y.ToString());
+                    writer.WriteAttributeString("y", size.Y.ToString(Culture.FormatProvider));
-                    writer.WriteAttributeString("z", size.Z.ToString());
+                    writer.WriteAttributeString("z", size.Z.ToString(Culture.FormatProvider));
                    // Embed the offsets into the group XML
                    for (int i = 0; i < coaObjects.Count; i++)
@@ -100,9 +100,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 //                            i, obj.Name);
                        writer.WriteStartElement("SceneObjectGroup");
-                        writer.WriteAttributeString("offsetx", offsets[i].X.ToString());
+                        writer.WriteAttributeString("offsetx", offsets[i].X.ToString(Culture.FormatProvider));
-                        writer.WriteAttributeString("offsety", offsets[i].Y.ToString());
+                        writer.WriteAttributeString("offsety", offsets[i].Y.ToString(Culture.FormatProvider));
-                        writer.WriteAttributeString("offsetz", offsets[i].Z.ToString());
+                        writer.WriteAttributeString("offsetz", offsets[i].Z.ToString(Culture.FormatProvider));
                        SceneObjectSerializer.ToOriginalXmlFormat(obj, writer, doScriptStates);
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index b012a08..82bbe6f 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -65,7 +65,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
            {
                using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment }))
                {
-                    try {
+                    try
+                    {
                        return FromOriginalXmlFormat(reader);
                    }
                    catch (Exception e)
@@ -109,11 +110,23 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                    }
                }
                while (reader.ReadToNextSibling("Part"));
+            reader.ReadEndElement();
+            }
+            if (reader.Name == "KeyframeMotion" && reader.NodeType == XmlNodeType.Element)
+            {
+                string innerkeytxt = reader.ReadElementContentAsString();
+                sceneObject.RootPart.KeyframeMotion = 
+                    KeyframeMotion.FromData(sceneObject, Convert.FromBase64String(innerkeytxt));
            }
+            else
+                sceneObject.RootPart.KeyframeMotion = null;
            // Script state may, or may not, exist. Not having any, is NOT
            // ever a problem.
            sceneObject.LoadScriptState(reader);
            sceneObject.InvalidateDeepEffectivePerms();
            return sceneObject;
        }
@@ -210,9 +223,19 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
            writer.WriteEndElement(); // OtherParts
+            if (sceneObject.RootPart.KeyframeMotion != null)
+            {
+                Byte[] data = sceneObject.RootPart.KeyframeMotion.Serialize();
+                writer.WriteStartElement(String.Empty, "KeyframeMotion", String.Empty);
+                writer.WriteBase64(data, 0, data.Length);
+                writer.WriteEndElement();
+            }
            if (doScriptStates)
                sceneObject.SaveScriptedState(writer);
            if (!noRootElement)
                writer.WriteEndElement(); // SceneObjectGroup
@@ -1459,10 +1482,10 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
            writer.WriteElementString("Description", sop.Description);
            writer.WriteStartElement("Color");
-            writer.WriteElementString("R", sop.Color.R.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("R", sop.Color.R.ToString(Culture.FormatProvider));
-            writer.WriteElementString("G", sop.Color.G.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("G", sop.Color.G.ToString(Culture.FormatProvider));
-            writer.WriteElementString("B", sop.Color.B.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("B", sop.Color.B.ToString(Culture.FormatProvider));
-            writer.WriteElementString("A", sop.Color.A.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("A", sop.Color.A.ToString(Culture.FormatProvider));
            writer.WriteEndElement();
            writer.WriteElementString("Text", sop.Text);
@@ -1505,7 +1528,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
            writer.WriteElementString("NextOwnerMask", sop.NextOwnerMask.ToString());
            WriteFlags(writer, "Flags", sop.Flags.ToString(), options);
            WriteUUID(writer, "CollisionSound", sop.CollisionSound, options);
-            writer.WriteElementString("CollisionSoundVolume", sop.CollisionSoundVolume.ToString());
+            writer.WriteElementString("CollisionSoundVolume", sop.CollisionSoundVolume.ToString(Culture.FormatProvider));
            if (sop.MediaUrl != null)
                writer.WriteElementString("MediaUrl", sop.MediaUrl.ToString());
            WriteVector(writer, "AttachedPos", sop.AttachedPos);
@@ -1525,7 +1548,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
            writer.WriteElementString("PayPrice3", sop.PayPrice[3].ToString());
            writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString());
-            writer.WriteElementString("Buoyancy", sop.Buoyancy.ToString());
+            writer.WriteElementString("Buoyancy", sop.Buoyancy.ToString(Culture.FormatProvider));
            WriteVector(writer, "Force", sop.Force);
            WriteVector(writer, "Torque", sop.Torque);
@@ -1542,22 +1565,22 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                writer.WriteElementString("RotationAxisLocks", sop.RotationAxisLocks.ToString().ToLower());
            writer.WriteElementString("PhysicsShapeType", sop.PhysicsShapeType.ToString().ToLower());
            if (sop.Density != 1000.0f)
-                writer.WriteElementString("Density", sop.Density.ToString().ToLower());
+                writer.WriteElementString("Density", sop.Density.ToString(Culture.FormatProvider));
            if (sop.Friction != 0.6f)
-                writer.WriteElementString("Friction", sop.Friction.ToString().ToLower());
+                writer.WriteElementString("Friction", sop.Friction.ToString(Culture.FormatProvider));
            if (sop.Restitution != 0.5f)
-                writer.WriteElementString("Bounce", sop.Restitution.ToString().ToLower());
+                writer.WriteElementString("Bounce", sop.Restitution.ToString(Culture.FormatProvider));
            if (sop.GravityModifier != 1.0f)
-                writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower());
+                writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString(Culture.FormatProvider));
            WriteVector(writer, "CameraEyeOffset", sop.GetCameraEyeOffset());
            WriteVector(writer, "CameraAtOffset", sop.GetCameraAtOffset());
 //           if (sop.Sound != UUID.Zero)  force it till sop crossing does clear it on child prim
            {
                WriteUUID(writer, "SoundID", sop.Sound, options);
-                writer.WriteElementString("SoundGain", sop.SoundGain.ToString().ToLower());
+                writer.WriteElementString("SoundGain", sop.SoundGain.ToString(Culture.FormatProvider));
                writer.WriteElementString("SoundFlags", sop.SoundFlags.ToString().ToLower());
-                writer.WriteElementString("SoundRadius", sop.SoundRadius.ToString().ToLower());
+                writer.WriteElementString("SoundRadius", sop.SoundRadius.ToString(Culture.FormatProvider));
            }
            writer.WriteElementString("SoundQueueing", sop.SoundQueueing.ToString().ToLower());
@@ -1577,19 +1600,19 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
        static void WriteVector(XmlTextWriter writer, string name, Vector3 vec)
        {
            writer.WriteStartElement(name);
-            writer.WriteElementString("X", vec.X.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("X", vec.X.ToString(Culture.FormatProvider));
-            writer.WriteElementString("Y", vec.Y.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Y", vec.Y.ToString(Culture.FormatProvider));
-            writer.WriteElementString("Z", vec.Z.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Z", vec.Z.ToString(Culture.FormatProvider));
            writer.WriteEndElement();
        }
        static void WriteQuaternion(XmlTextWriter writer, string name, Quaternion quat)
        {
            writer.WriteStartElement(name);
-            writer.WriteElementString("X", quat.X.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("X", quat.X.ToString(Culture.FormatProvider));
-            writer.WriteElementString("Y", quat.Y.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Y", quat.Y.ToString(Culture.FormatProvider));
-            writer.WriteElementString("Z", quat.Z.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Z", quat.Z.ToString(Culture.FormatProvider));
-            writer.WriteElementString("W", quat.W.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("W", quat.W.ToString(Culture.FormatProvider));
            writer.WriteEndElement();
        }
@@ -1731,22 +1754,22 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                // Don't serialize SculptData. It's just a copy of the asset, which can be loaded separately using 'SculptTexture'.
                writer.WriteElementString("FlexiSoftness", shp.FlexiSoftness.ToString());
-                writer.WriteElementString("FlexiTension", shp.FlexiTension.ToString());
+                writer.WriteElementString("FlexiTension", shp.FlexiTension.ToString(Culture.FormatProvider));
-                writer.WriteElementString("FlexiDrag", shp.FlexiDrag.ToString());
+                writer.WriteElementString("FlexiDrag", shp.FlexiDrag.ToString(Culture.FormatProvider));
-                writer.WriteElementString("FlexiGravity", shp.FlexiGravity.ToString());
+                writer.WriteElementString("FlexiGravity", shp.FlexiGravity.ToString(Culture.FormatProvider));
-                writer.WriteElementString("FlexiWind", shp.FlexiWind.ToString());
+                writer.WriteElementString("FlexiWind", shp.FlexiWind.ToString(Culture.FormatProvider));
-                writer.WriteElementString("FlexiForceX", shp.FlexiForceX.ToString());
+                writer.WriteElementString("FlexiForceX", shp.FlexiForceX.ToString(Culture.FormatProvider));
-                writer.WriteElementString("FlexiForceY", shp.FlexiForceY.ToString());
+                writer.WriteElementString("FlexiForceY", shp.FlexiForceY.ToString(Culture.FormatProvider));
-                writer.WriteElementString("FlexiForceZ", shp.FlexiForceZ.ToString());
+                writer.WriteElementString("FlexiForceZ", shp.FlexiForceZ.ToString(Culture.FormatProvider));
-                writer.WriteElementString("LightColorR", shp.LightColorR.ToString());
+                writer.WriteElementString("LightColorR", shp.LightColorR.ToString(Culture.FormatProvider));
-                writer.WriteElementString("LightColorG", shp.LightColorG.ToString());
+                writer.WriteElementString("LightColorG", shp.LightColorG.ToString(Culture.FormatProvider));
-                writer.WriteElementString("LightColorB", shp.LightColorB.ToString());
+                writer.WriteElementString("LightColorB", shp.LightColorB.ToString(Culture.FormatProvider));
-                writer.WriteElementString("LightColorA", shp.LightColorA.ToString());
+                writer.WriteElementString("LightColorA", shp.LightColorA.ToString(Culture.FormatProvider));
-                writer.WriteElementString("LightRadius", shp.LightRadius.ToString());
+                writer.WriteElementString("LightRadius", shp.LightRadius.ToString(Culture.FormatProvider));
-                writer.WriteElementString("LightCutoff", shp.LightCutoff.ToString());
+                writer.WriteElementString("LightCutoff", shp.LightCutoff.ToString(Culture.FormatProvider));
-                writer.WriteElementString("LightFalloff", shp.LightFalloff.ToString());
+                writer.WriteElementString("LightFalloff", shp.LightFalloff.ToString(Culture.FormatProvider));
-                writer.WriteElementString("LightIntensity", shp.LightIntensity.ToString());
+                writer.WriteElementString("LightIntensity", shp.LightIntensity.ToString(Culture.FormatProvider));
                writer.WriteElementString("FlexiEntry", shp.FlexiEntry.ToString().ToLower());
                writer.WriteElementString("LightEntry", shp.LightEntry.ToString().ToLower());
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs
index 045fd3c..4ce6a95 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs
@@ -54,8 +54,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            UUID ownerId = TestHelpers.ParseTail(0x1);
            SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(3, ownerId, "so1", 0x10);
-            so1.ScriptSetPhysicsStatus(true);
            m_scene.AddSceneObject(so1);
+            so1.ScriptSetPhysicsStatus(true);
            Assert.That(m_scene.SceneGraph.GetTotalObjectsCount(), Is.EqualTo(3));
            Assert.That(m_scene.SceneGraph.GetActiveObjectsCount(), Is.EqualTo(3));
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 5a9a5a0..80d3f62 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -65,7 +65,10 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        /// <value>The gathered uuids.</value>
        public IDictionary<UUID, sbyte> GatheredUuids { get; private set; }
+        public HashSet<UUID> FailedUUIDs { get; private set; }
+        public HashSet<UUID> UncertainAssetsUUIDs { get; private set; }
+        public int possibleNotAssetCount { get; set; }
+        public int ErrorCount { get; private set; }
        /// <summary>
        /// Gets the next UUID to inspect.
        /// </summary>
@@ -92,7 +95,10 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="assetService">
        /// Asset service.
        /// </param>
-        public UuidGatherer(IAssetService assetService) : this(assetService, new Dictionary<UUID, sbyte>()) {}
+        public UuidGatherer(IAssetService assetService) : this(assetService, new Dictionary<UUID, sbyte>(),
+                new HashSet <UUID>(),new HashSet <UUID>()) {}
+        public UuidGatherer(IAssetService assetService, IDictionary<UUID, sbyte> collector) : this(assetService, collector,
+            new HashSet <UUID>(), new HashSet <UUID>()) {}
        /// <summary>
        /// Initializes a new instance of the <see cref="OpenSim.Region.Framework.Scenes.UuidGatherer"/> class.
@@ -101,16 +107,20 @@ namespace OpenSim.Region.Framework.Scenes
        /// Asset service.
        /// </param>
        /// <param name="collector">
-        /// Gathered UUIDs will be collected in this dictinaory.
+        /// Gathered UUIDs will be collected in this dictionary.
        /// It can be pre-populated if you want to stop the gatherer from analyzing assets that have already been fetched and inspected.
        /// </param>
-        public UuidGatherer(IAssetService assetService, IDictionary<UUID, sbyte> collector)
+        public UuidGatherer(IAssetService assetService, IDictionary<UUID, sbyte> collector, HashSet <UUID> failedIDs, HashSet <UUID> uncertainAssetsUUIDs)
        {
            m_assetService = assetService;
            GatheredUuids = collector;
            // FIXME: Not efficient for searching, can improve.
            m_assetUuidsToInspect = new Queue<UUID>();
+            FailedUUIDs = failedIDs;
+            UncertainAssetsUUIDs = uncertainAssetsUUIDs;
+            ErrorCount = 0;
+            possibleNotAssetCount = 0;
        }
        /// <summary>
@@ -120,6 +130,19 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="uuid">UUID.</param>
        public bool AddForInspection(UUID uuid)
        {
+            if(uuid == UUID.Zero)
+                return false;
+            if(FailedUUIDs.Contains(uuid))
+            {
+                if(UncertainAssetsUUIDs.Contains(uuid))
+                    possibleNotAssetCount++;
+                else
+                    ErrorCount++;
+                return false;
+            }
+            if(GatheredUuids.ContainsKey(uuid))
+                return false;
            if (m_assetUuidsToInspect.Contains(uuid))
                return false;
@@ -141,7 +164,9 @@ namespace OpenSim.Region.Framework.Scenes
        public void AddForInspection(SceneObjectGroup sceneObject)
        {
            //            m_log.DebugFormat(
-            //                "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID);
+            //                "[UUID GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID);
+            if(sceneObject.IsDeleted)
+                return;
            SceneObjectPart[] parts = sceneObject.Parts;
            for (int i = 0; i < parts.Length; i++)
@@ -149,7 +174,7 @@ namespace OpenSim.Region.Framework.Scenes
                SceneObjectPart part = parts[i];
                //                m_log.DebugFormat(
-                //                    "[ARCHIVER]: Getting part {0}, {1} for object {2}", part.Name, part.UUID, sceneObject.UUID);
+                //                    "[UUID GATHERER]: Getting part {0}, {1} for object {2}", part.Name, part.UUID, sceneObject.UUID);
                try
                {
@@ -207,9 +232,7 @@ namespace OpenSim.Region.Framework.Scenes
                        //                        m_log.DebugFormat(
                        //                            "[ARCHIVER]: Analysing item {0} asset type {1} in {2} {3}",
                        //                            tii.Name, tii.Type, part.Name, part.UUID);
+                        AddForInspection(tii.AssetID, (sbyte)tii.Type);
-                        if (!GatheredUuids.ContainsKey(tii.AssetID))
-                            AddForInspection(tii.AssetID, (sbyte)tii.Type);
                    }
                    // FIXME: We need to make gathering modular but we cannot yet, since gatherers are not guaranteed
@@ -225,9 +248,6 @@ namespace OpenSim.Region.Framework.Scenes
                catch (Exception e)
                {
                    m_log.ErrorFormat("[UUID GATHERER]: Failed to get part - {0}", e);
-                    m_log.DebugFormat(
-                        "[UUID GATHERER]: Texture entry length for prim was {0} (min is 46)",
-                        part.Shape.TextureEntry.Length);
                }
            }
        }
@@ -278,55 +298,112 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="assetUuid">The uuid of the asset for which to gather referenced assets</param>
        private void GetAssetUuids(UUID assetUuid)
        {
+            if(assetUuid == UUID.Zero)
+                return;
+            if(FailedUUIDs.Contains(assetUuid))
+            {
+                if(UncertainAssetsUUIDs.Contains(assetUuid))
+                    possibleNotAssetCount++;
+                else
+                    ErrorCount++;
+                return;
+            }
            // avoid infinite loops
            if (GatheredUuids.ContainsKey(assetUuid))
                return;
+            AssetBase assetBase;
            try
            {
-                AssetBase assetBase = GetAsset(assetUuid);
+                assetBase = GetAsset(assetUuid);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[UUID GATHERER]: Failed to get asset {0} : {1}", assetUuid, e.Message);
+                ErrorCount++;
+                FailedUUIDs.Add(assetUuid);
+                return;
+            }
-                if (null != assetBase)
+            if(assetBase == null)
-                {
+            {
-                    sbyte assetType = assetBase.Type;
+//                m_log.ErrorFormat("[UUID GATHERER]: asset {0} not found", assetUuid);
-                    GatheredUuids[assetUuid] = assetType;
+                FailedUUIDs.Add(assetUuid);
+                if(UncertainAssetsUUIDs.Contains(assetUuid))
+                    possibleNotAssetCount++;
+                else
+                    ErrorCount++;
+                return;
+            }
-                    if ((sbyte)AssetType.Bodypart == assetType || (sbyte)AssetType.Clothing == assetType)
+            if(UncertainAssetsUUIDs.Contains(assetUuid))
-                    {
+                UncertainAssetsUUIDs.Remove(assetUuid);
-                        RecordWearableAssetUuids(assetBase);
-                    }
+            sbyte assetType = assetBase.Type;
-                    else if ((sbyte)AssetType.Gesture == assetType)
-                    {
+            if(assetBase.Data == null || assetBase.Data.Length == 0)
-                        RecordGestureAssetUuids(assetBase);
+            {
-                    }
+//                m_log.ErrorFormat("[UUID GATHERER]: asset {0}, type {1} has no data", assetUuid, assetType);
-                    else if ((sbyte)AssetType.Notecard == assetType)
+                ErrorCount++;
-                    {
+                FailedUUIDs.Add(assetUuid);
-                        RecordTextEmbeddedAssetUuids(assetBase);
+                return;
-                    }
+            }
-                    else if ((sbyte)AssetType.LSLText == assetType)
-                    {
+            GatheredUuids[assetUuid] = assetType;
-                        RecordTextEmbeddedAssetUuids(assetBase);
+            try
-                    }
+            {
-                    else if ((sbyte)OpenSimAssetType.Material == assetType)
+                if ((sbyte)AssetType.Bodypart == assetType || (sbyte)AssetType.Clothing == assetType)
-                    {
+                {
-                        RecordMaterialAssetUuids(assetBase);
+                    RecordWearableAssetUuids(assetBase);
-                    }
+                }
-                    else if ((sbyte)AssetType.Object == assetType)
+                else if ((sbyte)AssetType.Gesture == assetType)
-                    {
+                {
-                        RecordSceneObjectAssetUuids(assetBase);
+                    RecordGestureAssetUuids(assetBase);
-                    }
+                }
+                else if ((sbyte)AssetType.Notecard == assetType)
+                {
+                    RecordTextEmbeddedAssetUuids(assetBase);
+                }
+                else if ((sbyte)AssetType.LSLText == assetType)
+                {
+                    RecordTextEmbeddedAssetUuids(assetBase);
+                }
+                else if ((sbyte)OpenSimAssetType.Material == assetType)
+                {
+                    RecordMaterialAssetUuids(assetBase);
+                }
+                else if ((sbyte)AssetType.Object == assetType)
+                {
+                    RecordSceneObjectAssetUuids(assetBase);
                }
            }
-            catch (Exception)
+            catch (Exception e)
            {
-                m_log.ErrorFormat("[UUID GATHERER]: Failed to gather uuids for asset id {0}", assetUuid);
+                m_log.ErrorFormat("[UUID GATHERER]: Failed to gather uuids for asset with id {0} type {1}: {2}", assetUuid, assetType, e.Message);
-                throw;
+                GatheredUuids.Remove(assetUuid);
+                ErrorCount++;
+                FailedUUIDs.Add(assetUuid);
            }
        }
        private void AddForInspection(UUID assetUuid, sbyte assetType)
        {
+            if(assetUuid == UUID.Zero)
+                return;
            // Here, we want to collect uuids which require further asset fetches but mark the others as gathered
+            if(FailedUUIDs.Contains(assetUuid))
+            {
+                if(UncertainAssetsUUIDs.Contains(assetUuid))
+                    possibleNotAssetCount++;
+                else
+                    ErrorCount++;
+                return;
+            }
+            if(GatheredUuids.ContainsKey(assetUuid))
+                return;
            try
            {
                if ((sbyte)AssetType.Bodypart == assetType
@@ -458,8 +535,11 @@ namespace OpenSim.Region.Framework.Scenes
            foreach (Match uuidMatch in uuidMatches)
            {
                UUID uuid = new UUID(uuidMatch.Value);
+                if(uuid == UUID.Zero)
+                    continue;
 //                m_log.DebugFormat("[UUID GATHERER]: Recording {0} in text", uuid);
+                if(!UncertainAssetsUUIDs.Contains(uuid))
+                    UncertainAssetsUUIDs.Add(uuid);
                AddForInspection(uuid);
            }
        }
diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
index 79b80f8..a14d819 100644
--- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
+++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
@@ -59,23 +59,23 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
    /// </summary>
    /// <remarks>
    /// Config Settings Documentation.
-    /// Each configuration setting can be specified in two places: OpenSim.ini or Regions.ini.
+    /// Configuration setting can be specified in two places: OpenSim.ini and/or Regions.ini.
-    /// If specified in Regions.ini, the settings should be within the region's section name.
-    /// If specified in OpenSim.ini, the settings should be within the [AutoBackupModule] section.
-    /// Region-specific settings take precedence.
    ///
-    /// AutoBackupModuleEnabled: True/False. Default: False. If True, use the auto backup module. This setting does not support per-region basis.
+    /// OpenSim.ini only settings section [AutoBackupModule]
-    ///     All other settings under [AutoBackupModule] are ignored if AutoBackupModuleEnabled is false, even per-region settings!
+    /// AutoBackupModuleEnabled: True/False. Default: False. If True, use the auto backup module.
-    /// AutoBackup: True/False. Default: False. If True, activate auto backup functionality.
+    ///     if false module is disable and all rest is ignored
-    ///         This is the only required option for enabling auto-backup; the other options have sane defaults.
-    ///         If False for a particular region, the auto-backup module becomes a no-op for the region, and all other AutoBackup* settings are ignored.
-    ///         If False globally (the default), only regions that specifically override it in Regions.ini will get AutoBackup functionality.
    /// AutoBackupInterval: Double, non-negative value. Default: 720 (12 hours).
    ///         The number of minutes between each backup attempt.
-    ///         If a negative or zero value is given, it is equivalent to setting AutoBackup = False.
+    /// AutoBackupDir: String. Default: "." (the current directory).
-    /// AutoBackupBusyCheck: True/False. Default: True.
+    ///         A directory (absolute or relative) where backups should be saved.
-    ///         If True, we will only take an auto-backup if a set of conditions are met.
+    /// AutoBackupKeepFilesForDays remove files older than this number of days. 0  disables
-    ///         These conditions are heuristics to try and avoid taking a backup when the sim is busy.
+    /// 
+    /// Next can be set on OpenSim.ini, as default, and or per region in Regions.ini
+    /// Region-specific settings take precedence.
+    /// 
+    /// AutoBackup: True/False. Default: False. If True, activate auto backup functionality.
+    ///     controls backup per region, with default optionaly set on OpenSim.ini
+    
    /// AutoBackupSkipAssets
    ///     If true, assets are not saved to the oar file. Considerably reduces impact on simulator when backing up. Intended for when assets db is backed up separately
    /// AutoBackupKeepFilesForDays
@@ -89,40 +89,28 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
    /// AutoBackupNaming: string. Default: Time.
    ///         One of three strings (case insensitive):
    ///         "Time": Current timestamp is appended to file name. An existing file will never be overwritten.
-    ///  "Sequential": A number is appended to the file name. So if RegionName_x.oar exists, we'll save to RegionName_{x+1}.oar next. An existing file will never be overwritten.
+    ///     "Sequential": A number is appended to the file name. So if RegionName_x.oar exists, we'll save to RegionName_{x+1}.oar next. An existing file will never be overwritten.
-    ///  "Overwrite": Always save to file named "${AutoBackupDir}/RegionName.oar", even if we have to overwrite an existing file.
+    ///     "Overwrite": Always save to file named "${AutoBackupDir}/RegionName.oar", even if we have to overwrite an existing file.
-    /// AutoBackupDir: String. Default: "." (the current directory).
-    ///         A directory (absolute or relative) where backups should be saved.
-    /// AutoBackupDilationThreshold: float. Default: 0.5. Lower bound on time dilation required for BusyCheck heuristics to pass.
-    ///  If the time dilation is below this value, don't take a backup right now.
-    /// AutoBackupAgentThreshold: int. Default: 10. Upper bound on # of agents in region required for BusyCheck heuristics to pass.
-    ///  If the number of agents is greater than this value, don't take a backup right now
-    /// Save memory by setting low initial capacities. Minimizes impact in common cases of all regions using same interval, and instances hosting 1 ~ 4 regions.
-    /// Also helps if you don't want AutoBackup at all.
    /// </remarks>
    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AutoBackupModule")]
    public class AutoBackupModule : ISharedRegionModule
    {
        private static readonly ILog m_log =
            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private readonly Dictionary<Guid, IScene> m_pendingSaves = new Dictionary<Guid, IScene>(1);
        private readonly AutoBackupModuleState m_defaultState = new AutoBackupModuleState();
        private readonly Dictionary<IScene, AutoBackupModuleState> m_states =
            new Dictionary<IScene, AutoBackupModuleState>(1);
-        private readonly Dictionary<Timer, List<IScene>> m_timerMap =
-            new Dictionary<Timer, List<IScene>>(1);
-        private readonly Dictionary<double, Timer> m_timers = new Dictionary<double, Timer>(1);
        private delegate T DefaultGetter<T>(string settingName, T defaultValue);
        private bool m_enabled;
        private ICommandConsole m_console;
        private List<Scene> m_Scenes = new List<Scene> ();
+        private Timer m_masterTimer;
+        private bool m_busy;
-        /// <summary>
+        private int m_KeepFilesForDays = -1;
-        /// Whether the shared module should be enabled at all. NOT the same as m_Enabled in AutoBackupModuleState!
+        private string m_backupDir;
-        /// </summary>
+        private bool m_doneFirst;
-        private bool m_closed;
+        private double m_baseInterval;
        private IConfigSource m_configSource;
@@ -159,36 +147,38 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
        void IRegionModuleBase.Initialise(IConfigSource source)
        {
            // Determine if we have been enabled at all in OpenSim.ini -- this is part and parcel of being an optional module
-            this.m_configSource = source;
+            m_configSource = source;
            IConfig moduleConfig = source.Configs["AutoBackupModule"];
            if (moduleConfig == null)
            {
-                this.m_enabled = false;
+                m_enabled = false;
                return;
            }
-            else
-            {
-                this.m_enabled = moduleConfig.GetBoolean("AutoBackupModuleEnabled", false);
-                if (this.m_enabled)
-                {
-                    m_log.Info("[AUTO BACKUP]: AutoBackupModule enabled");
-                }
-                else
-                {
-                    return;
-                }
-            }
-            Timer defTimer = new Timer(43200000);
+            m_enabled = moduleConfig.GetBoolean("AutoBackupModuleEnabled", false);
-            this.m_defaultState.Timer = defTimer;
+            if(!m_enabled)
-            this.m_timers.Add(43200000, defTimer);
+                return;
-            defTimer.Elapsed += this.HandleElapsed;
-            defTimer.AutoReset = true;
+            ParseDefaultConfig(moduleConfig);
-            defTimer.Start();
+            if(!m_enabled)
+                return;
+            m_log.Debug("[AUTO BACKUP]: Default config:");
+            m_log.Debug(m_defaultState.ToString());
+            m_log.Info("[AUTO BACKUP]: AutoBackupModule enabled");
+            m_masterTimer = new Timer();
+            m_masterTimer.Interval = m_baseInterval;
+            m_masterTimer.Elapsed += HandleElapsed;
+            m_masterTimer.AutoReset = false;
-            AutoBackupModuleState abms = this.ParseConfig(null, true);
+            m_console = MainConsole.Instance;
-            m_log.Debug("[AUTO BACKUP]: Here is the default config:");
-            m_log.Debug(abms.ToString());
+            m_console.Commands.AddCommand (
+                        "AutoBackup", true, "dooarbackup",
+                        "dooarbackup <regionName> | ALL",
+                        "saves the single region <regionName> to a oar or ALL regions in instance to oars, using same settings as AutoBackup. Note it restarts time interval", DoBackup);
+            m_busy = true;            
        }
        /// <summary>
@@ -196,13 +186,11 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
        /// </summary>
        void IRegionModuleBase.Close()
        {
-            if (!this.m_enabled)
+            if (!m_enabled)
-            {
                return;
-            }
            // We don't want any timers firing while the sim's coming down; strange things may happen.
-            this.StopAllTimers();
+            m_masterTimer.Dispose();
        }
        /// <summary>
@@ -211,18 +199,11 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
        /// <param name="scene"></param>
        void IRegionModuleBase.AddRegion (Scene scene)
        {
-            if (!this.m_enabled) {
+            if (!m_enabled)
                return;
-            }
-            lock (m_Scenes) {
-                m_Scenes.Add (scene);
-            }
-            m_console = MainConsole.Instance;
-            m_console.Commands.AddCommand (
+            lock (m_Scenes)
-                "AutoBackup", false, "dobackup",
+                m_Scenes.Add (scene);
-                "dobackup",
-                "do backup.", DoBackup);
        }
        /// <summary>
@@ -231,28 +212,14 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
        /// <param name="scene">The scene (region) to stop performing AutoBackup on.</param>
        void IRegionModuleBase.RemoveRegion(Scene scene)
        {
-            if (!this.m_enabled)
+            if (m_enabled)
-            {
                return;
-            }
-            m_Scenes.Remove (scene);
-            if (this.m_states.ContainsKey(scene))
-            {
-                AutoBackupModuleState abms = this.m_states[scene];
-                // Remove this scene out of the timer map list
+            lock(m_Scenes)
-                Timer timer = abms.Timer;
+            {
-                List<IScene> list = this.m_timerMap[timer];
+                if (m_states.ContainsKey(scene))
-                list.Remove(scene);
+                    m_states.Remove(scene);
+                m_Scenes.Remove(scene);
-                // Shut down the timer if this was the last scene for the timer
-                if (list.Count == 0)
-                {
-                    this.m_timerMap.Remove(timer);
-                    this.m_timers.Remove(timer.Interval);
-                    timer.Close();
-                }
-                this.m_states.Remove(scene);
            }
        }
@@ -263,22 +230,29 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
        /// <param name="scene">The scene to (possibly) perform AutoBackup on.</param>
        void IRegionModuleBase.RegionLoaded(Scene scene)
        {
-            if (!this.m_enabled)
+            if (!m_enabled)
-            {
                return;
-            }
            // This really ought not to happen, but just in case, let's pretend it didn't...
            if (scene == null)
-            {
                return;
-            }
-            AutoBackupModuleState abms = this.ParseConfig(scene, false);
+            AutoBackupModuleState abms = ParseConfig(scene);
-            m_log.Debug("[AUTO BACKUP]: Config for " + scene.RegionInfo.RegionName);
+            if(abms == null)
-            m_log.Debug((abms == null ? "DEFAULT" : abms.ToString()));
+            {
+                m_log.Debug("[AUTO BACKUP]: Config for " + scene.RegionInfo.RegionName);
+                m_log.Debug("DEFAULT");
+                abms = new AutoBackupModuleState(m_defaultState);
+            }
+            else
+            {
+                m_log.Debug("[AUTO BACKUP]: Config for " + scene.RegionInfo.RegionName);
+                m_log.Debug(abms.ToString());
+            }
            m_states.Add(scene, abms);
+            m_busy = false;
+            m_masterTimer.Start();
        }
        /// <summary>
@@ -292,356 +266,174 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
        private void DoBackup (string module, string[] args)
        {
-            if (args.Length != 2) {
+            if (!m_enabled)
-                MainConsole.Instance.OutputFormat ("Usage: dobackup <regionname>");
                return;
-            }
-            bool found = false;
-            string name = args [1];
-            lock (m_Scenes) {
-                foreach (Scene s in m_Scenes) {
-                    string test = s.Name.ToString ();
-                    if (test == name) {
-                        found = true;
-                        DoRegionBackup (s);
-                    }
-                }
-                if (!found) {
-                    MainConsole.Instance.OutputFormat ("No such region {0}. Nothing to backup", name);
-                }
-            }
-        }
-        /// <summary>
+            if (args.Length != 2)
-        /// Set up internal state for a given scene. Fairly complex code.
-        /// When this method returns, we've started auto-backup timers, put members in Dictionaries, and created a State object for this scene.
-        /// </summary>
-        /// <param name="scene">The scene to look at.</param>
-        /// <param name="parseDefault">Whether this call is intended to figure out what we consider the "default" config (applied to all regions unless overridden by per-region settings).</param>
-        /// <returns>An AutoBackupModuleState contains most information you should need to know relevant to auto-backup, as applicable to a single region.</returns>
-        private AutoBackupModuleState ParseConfig(IScene scene, bool parseDefault)
-        {
-            string sRegionName;
-            string sRegionLabel;
-//            string prepend;
-            AutoBackupModuleState state;
-            if (parseDefault)
            {
-                sRegionName = null;
+                MainConsole.Instance.OutputFormat ("Usage: dooarbackup <regionname>");
-                sRegionLabel = "DEFAULT";
+                return;
-//                prepend = "";
-                state = this.m_defaultState;
-            }
-            else
-            {
-                sRegionName = scene.RegionInfo.RegionName;
-                sRegionLabel = sRegionName;
-//                prepend = sRegionName + ".";
-                state = null;
-            }
-            // Read the config settings and set variables.
-            IConfig regionConfig = (scene != null ? scene.Config.Configs[sRegionName] : null);
-            IConfig config = this.m_configSource.Configs["AutoBackupModule"];
-            if (config == null)
-            {
-                // defaultState would be disabled too if the section doesn't exist.
-                state = this.m_defaultState;
-                return state;
            }
-            bool tmpEnabled = ResolveBoolean("AutoBackup", this.m_defaultState.Enabled, config, regionConfig);
+            if(m_busy)
-            if (state == null && tmpEnabled != this.m_defaultState.Enabled)
-                //Varies from default state
            {
-                state = new AutoBackupModuleState();
+                MainConsole.Instance.OutputFormat ("Already doing a backup, please try later");
+                return;
            }
-            if (state != null)
+            m_masterTimer.Stop();
-            {
+            m_busy = true;    
-                state.Enabled = tmpEnabled;
-            }
-            // If you don't want AutoBackup, we stop.
+            bool found = false;
-            if ((state == null && !this.m_defaultState.Enabled) || (state != null && !state.Enabled))
+            string name = args [1];
-            {
+            Scene[] scenes;
-                return state;
+            lock (m_Scenes)
-            }
+                scenes = m_Scenes.ToArray();
-            else
-            {
-                m_log.Info("[AUTO BACKUP]: Region " + sRegionLabel + " is AutoBackup ENABLED.");
-            }
-            // Borrow an existing timer if one exists for the same interval; otherwise, make a new one.
-            double interval =
-                this.ResolveDouble("AutoBackupInterval", this.m_defaultState.IntervalMinutes,
-                 config, regionConfig) * 60000.0;
-            if (state == null && interval != this.m_defaultState.IntervalMinutes * 60000.0)
-            {
-                state = new AutoBackupModuleState();
-            }
-            if (this.m_timers.ContainsKey(interval))
+            if(scenes == null)
-            {
+                return;
-                if (state != null)
-                {
-                    state.Timer = this.m_timers[interval];
-                }
-                m_log.Debug("[AUTO BACKUP]: Reusing timer for " + interval + " msec for region " +
-                            sRegionLabel);
-            }
-            else
-            {
-                // 0 or negative interval == do nothing.
-                if (interval <= 0.0 && state != null)
-                {
-                    state.Enabled = false;
-                    return state;
-                }
-                if (state == null)
-                {
-                    state = new AutoBackupModuleState();
-                }
-                Timer tim = new Timer(interval);
-                state.Timer = tim;
-                //Milliseconds -> minutes
-                this.m_timers.Add(interval, tim);
-                tim.Elapsed += this.HandleElapsed;
-                tim.AutoReset = true;
-                tim.Start();
-            }
-            // Add the current region to the list of regions tied to this timer.
+            Scene s;
-            if (scene != null)
+            try
            {
-                if (state != null)
+                if(name == "ALL")
                {
-                    if (this.m_timerMap.ContainsKey(state.Timer))
+                    for(int i = 0; i < scenes.Length; i++)
                    {
-                        this.m_timerMap[state.Timer].Add(scene);
+                        s = scenes[i];
-                    }
+                        DoRegionBackup(s);
-                    else
+                        if (!m_enabled)
-                    {
+                            return;
-                        List<IScene> scns = new List<IScene>(1);
-                        scns.Add(scene);
-                        this.m_timerMap.Add(state.Timer, scns);
                    }
+                    return;
                }
-                else
+                for(int i = 0; i < scenes.Length; i++)
                {
-                    if (this.m_timerMap.ContainsKey(this.m_defaultState.Timer))
+                    s = scenes[i];
-                    {
+                    if (s.Name == name)
-                        this.m_timerMap[this.m_defaultState.Timer].Add(scene);
-                    }
-                    else
                    {
-                        List<IScene> scns = new List<IScene>(1);
+                        found = true;
-                        scns.Add(scene);
+                        DoRegionBackup(s);
-                        this.m_timerMap.Add(this.m_defaultState.Timer, scns);
+                        break;
                    }
                }
            }
+            catch { }
-            bool tmpBusyCheck = ResolveBoolean("AutoBackupBusyCheck",
+            finally
-                                                  this.m_defaultState.BusyCheck, config, regionConfig);
-            if (state == null && tmpBusyCheck != this.m_defaultState.BusyCheck)
            {
-                state = new AutoBackupModuleState();
+                if (m_enabled)
-            }
+                    m_masterTimer.Start();
+                m_busy = false;
+            }               
+            if (!found)
+                    MainConsole.Instance.OutputFormat ("No such region {0}. Nothing to backup", name);
+        }
-            if (state != null)
+        private void ParseDefaultConfig(IConfig config)
-            {
+        {          
-                state.BusyCheck = tmpBusyCheck;
-            }
-            // Included Option To Skip Assets
+            m_backupDir = ".";
-            bool tmpSkipAssets = ResolveBoolean("AutoBackupSkipAssets",
+            string backupDir = config.GetString("AutoBackupDir", ".");
-                                                  this.m_defaultState.SkipAssets, config, regionConfig);
+            if (backupDir != ".")
-            if (state == null && tmpSkipAssets != this.m_defaultState.SkipAssets)
            {
-                state = new AutoBackupModuleState();
+                try
+                {
+                DirectoryInfo dirinfo = new DirectoryInfo(backupDir);
+                if (!dirinfo.Exists)
+                    dirinfo.Create();
+                }
+                catch (Exception e)
+                {
+                    m_enabled = false;
+                    m_log.WarnFormat("[AUTO BACKUP]: Error accessing backup folder {0}. Module disabled. {1}",
+                            backupDir, e);
+                    return;
+                }
            }
+            m_backupDir = backupDir;
-            if (state != null)
+            double interval = config.GetDouble("AutoBackupInterval", 720);
-            {
+            interval *= 60000.0;
-                state.SkipAssets = tmpSkipAssets;
+            m_baseInterval = interval;
-            }
            // How long to keep backup files in days, 0 Disables this feature
-            int tmpKeepFilesForDays = ResolveInt("AutoBackupKeepFilesForDays",
+            m_KeepFilesForDays = config.GetInt("AutoBackupKeepFilesForDays",m_KeepFilesForDays);
-                                                  this.m_defaultState.KeepFilesForDays, config, regionConfig);
-            if (state == null && tmpKeepFilesForDays != this.m_defaultState.KeepFilesForDays)
-            {
-                state = new AutoBackupModuleState();
-            }
-            if (state != null)
+            m_defaultState.Enabled = config.GetBoolean("AutoBackup", m_defaultState.Enabled);
-            {
-                state.KeepFilesForDays = tmpKeepFilesForDays;
+            m_defaultState.SkipAssets = config.GetBoolean("AutoBackupSkipAssets",m_defaultState.SkipAssets);
-            }
            // Set file naming algorithm
-            string stmpNamingType = ResolveString("AutoBackupNaming",
+            string stmpNamingType = config.GetString("AutoBackupNaming", m_defaultState.NamingType.ToString());
-                                                     this.m_defaultState.NamingType.ToString(), config, regionConfig);
            NamingType tmpNamingType;
            if (stmpNamingType.Equals("Time", StringComparison.CurrentCultureIgnoreCase))
-            {
                tmpNamingType = NamingType.Time;
-            }
            else if (stmpNamingType.Equals("Sequential", StringComparison.CurrentCultureIgnoreCase))
-            {
                tmpNamingType = NamingType.Sequential;
-            }
            else if (stmpNamingType.Equals("Overwrite", StringComparison.CurrentCultureIgnoreCase))
-            {
                tmpNamingType = NamingType.Overwrite;
-            }
            else
            {
-                m_log.Warn("Unknown naming type specified for region " + sRegionLabel + ": " +
+                m_log.Warn("Unknown naming type specified for Default");
-                           stmpNamingType);
                tmpNamingType = NamingType.Time;
            }
+            m_defaultState.NamingType = tmpNamingType;
-            if (state == null && tmpNamingType != this.m_defaultState.NamingType)
+            m_defaultState.Script = config.GetString("AutoBackupScript", m_defaultState.Script);
-            {
-                state = new AutoBackupModuleState();
-            }
-            if (state != null)
+        }
-            {
-                state.NamingType = tmpNamingType;
-            }
-            string tmpScript = ResolveString("AutoBackupScript",
+        /// <summary>
-                                                this.m_defaultState.Script, config, regionConfig);
+        /// Set up internal state for a given scene. Fairly complex code.
-            if (state == null && tmpScript != this.m_defaultState.Script)
+        /// When this method returns, we've started auto-backup timers, put members in Dictionaries, and created a State object for this scene.
-            {
+        /// </summary>
-                state = new AutoBackupModuleState();
+        /// <param name="scene">The scene to look at.</param>
-            }
+        /// <param name="parseDefault">Whether this call is intended to figure out what we consider the "default" config (applied to all regions unless overridden by per-region settings).</param>
+        /// <returns>An AutoBackupModuleState contains most information you should need to know relevant to auto-backup, as applicable to a single region.</returns>
+        private AutoBackupModuleState ParseConfig(IScene scene)
+        {
+            if(scene == null)
+                return null;
-            if (state != null)
+            string sRegionName;
-            {
+            AutoBackupModuleState state = null;
-                state.Script = tmpScript;
-            }
-            string tmpBackupDir = ResolveString("AutoBackupDir", ".", config, regionConfig);
+            sRegionName = scene.RegionInfo.RegionName;
-            if (state == null && tmpBackupDir != this.m_defaultState.BackupDir)
-            {
-                state = new AutoBackupModuleState();
-            }
-            if (state != null)
+            // Read the config settings and set variables.
-            {
+            IConfig regionConfig = scene.Config.Configs[sRegionName];
-                state.BackupDir = tmpBackupDir;
+            if (regionConfig == null)
-                // Let's give the user some convenience and auto-mkdir
+                return null;
-                if (state.BackupDir != ".")
-                {
-                    try
-                    {
-                        DirectoryInfo dirinfo = new DirectoryInfo(state.BackupDir);
-                        if (!dirinfo.Exists)
-                        {
-                            dirinfo.Create();
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Warn(
-                            "[AUTO BACKUP]: BAD NEWS. You won't be able to save backups to directory " +
-                            state.BackupDir +
-                            " because it doesn't exist or there's a permissions issue with it. Here's the exception.",
-                            e);
-                    }
-                }
-            }
-            if(state == null)
+            state = new AutoBackupModuleState();
-                return m_defaultState;
-            return state;
+            state.Enabled = regionConfig.GetBoolean("AutoBackup", m_defaultState.Enabled);
-        }
-        /// <summary>
+            // Included Option To Skip Assets
-        /// Helper function for ParseConfig.
+            state.SkipAssets = regionConfig.GetBoolean("AutoBackupSkipAssets", m_defaultState.SkipAssets);
-        /// </summary>
-        /// <param name="settingName"></param>
-        /// <param name="defaultValue"></param>
-        /// <param name="global"></param>
-        /// <param name="local"></param>
-        /// <returns></returns>
-        private bool ResolveBoolean(string settingName, bool defaultValue, IConfig global, IConfig local)
-        {
-            if(local != null)
-            {
-                return local.GetBoolean(settingName, global.GetBoolean(settingName, defaultValue));
-            }
-            else
-            {
-                return global.GetBoolean(settingName, defaultValue);
-            }
-        }
-        /// <summary>
+            // Set file naming algorithm
-        /// Helper function for ParseConfig.
+            string stmpNamingType = regionConfig.GetString("AutoBackupNaming", m_defaultState.NamingType.ToString());
-        /// </summary>
+            NamingType tmpNamingType;
-        /// <param name="settingName"></param>
+            if (stmpNamingType.Equals("Time", StringComparison.CurrentCultureIgnoreCase))
-        /// <param name="defaultValue"></param>
+                tmpNamingType = NamingType.Time;
-        /// <param name="global"></param>
+            else if (stmpNamingType.Equals("Sequential", StringComparison.CurrentCultureIgnoreCase))
-        /// <param name="local"></param>
+                tmpNamingType = NamingType.Sequential;
-        /// <returns></returns>
+            else if (stmpNamingType.Equals("Overwrite", StringComparison.CurrentCultureIgnoreCase))
-        private double ResolveDouble(string settingName, double defaultValue, IConfig global, IConfig local)
+                tmpNamingType = NamingType.Overwrite;
-        {
-            if (local != null)
-            {
-                return local.GetDouble(settingName, global.GetDouble(settingName, defaultValue));
-            }
            else
            {
-                return global.GetDouble(settingName, defaultValue);
+                m_log.Warn("Unknown naming type specified for region " + sRegionName + ": " +
+                           stmpNamingType);
+                tmpNamingType = NamingType.Time;
            }
-        }
+            m_defaultState.NamingType = tmpNamingType;
-        /// <summary>
+            state.Script = regionConfig.GetString("AutoBackupScript", m_defaultState.Script);
-        /// Helper function for ParseConfig.
+            return state;
-        /// </summary>
-        /// <param name="settingName"></param>
-        /// <param name="defaultValue"></param>
-        /// <param name="global"></param>
-        /// <param name="local"></param>
-        /// <returns></returns>
-        private int ResolveInt(string settingName, int defaultValue, IConfig global, IConfig local)
-        {
-            if (local != null)
-            {
-                return local.GetInt(settingName, global.GetInt(settingName, defaultValue));
-            }
-            else
-            {
-                return global.GetInt(settingName, defaultValue);
-            }
        }
-        /// <summary>
-        /// Helper function for ParseConfig.
-        /// </summary>
-        /// <param name="settingName"></param>
-        /// <param name="defaultValue"></param>
-        /// <param name="global"></param>
-        /// <param name="local"></param>
-        /// <returns></returns>
-        private string ResolveString(string settingName, string defaultValue, IConfig global, IConfig local)
-        {
-            if (local != null)
-            {
-                return local.GetString(settingName, global.GetString(settingName, defaultValue));
-            }
-            else
-            {
-                return global.GetString(settingName, defaultValue);
-            }
-        }
        /// <summary>
        /// Called when any auto-backup timer expires. This starts the code path for actually performing a backup.
@@ -650,63 +442,27 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
        /// <param name="e"></param>
        private void HandleElapsed(object sender, ElapsedEventArgs e)
        {
-            // TODO: heuristic thresholds are per-region, so we should probably run heuristics once per region
+            if (!m_enabled || m_busy)
-            // XXX: Running heuristics once per region could add undue performance penalty for something that's supposed to
-            // check whether the region is too busy! Especially on sims with LOTS of regions.
-            // Alternative: make heuristics thresholds global to the module rather than per-region. Less flexible,
-            //  but would allow us to be semantically correct while being easier on perf.
-            // Alternative 2: Run heuristics once per unique set of heuristics threshold parameters! Ay yi yi...
-            // Alternative 3: Don't support per-region heuristics at all; just accept them as a global only parameter.
-            // Since this is pretty experimental, I haven't decided which alternative makes the most sense.
-            if (this.m_closed)
-            {
                return;
-            }
-            bool heuristicsRun = false;
+            m_busy = true;
-            bool heuristicsPassed = false;
+            if(m_doneFirst && m_KeepFilesForDays > 0)
-            if (!this.m_timerMap.ContainsKey((Timer) sender))
+                RemoveOldFiles();
+            foreach (IScene scene in m_Scenes)
            {
-                m_log.Debug("[AUTO BACKUP]: Code-up error: timerMap doesn't contain timer " + sender);
+                if (!m_enabled)
+                    return;
+                DoRegionBackup(scene);
            }
-            List<IScene> tmap = this.m_timerMap[(Timer) sender];
+            if (m_enabled)
-            if (tmap != null && tmap.Count > 0)
            {
-                foreach (IScene scene in tmap)
+                m_masterTimer.Start();
-                {
+                m_busy = false;
-                    AutoBackupModuleState state = this.m_states[scene];
-                    bool heuristics = state.BusyCheck;
-                    // Fast path: heuristics are on; already ran em; and sim is fine; OR, no heuristics for the region.
-                    if ((heuristics && heuristicsRun && heuristicsPassed) || !heuristics)
-                    {
-                        this.DoRegionBackup(scene);
-                        // Heuristics are on; ran but we're too busy -- keep going. Maybe another region will have heuristics off!
-                    }
-                    else if (heuristicsRun)
-                    {
-                        m_log.Info("[AUTO BACKUP]: Heuristics: too busy to backup " +
-                                   scene.RegionInfo.RegionName + " right now.");
-                        continue;
-                        // Logical Deduction: heuristics are on but haven't been run
-                    }
-                    else
-                    {
-                        heuristicsPassed = this.RunHeuristics(scene);
-                        heuristicsRun = true;
-                        if (!heuristicsPassed)
-                        {
-                            m_log.Info("[AUTO BACKUP]: Heuristics: too busy to backup " +
-                                       scene.RegionInfo.RegionName + " right now.");
-                            continue;
-                        }
-                        this.DoRegionBackup(scene);
-                    }
-                    // Remove Old Backups
-                    this.RemoveOldFiles(state);
-                }
            }
+            m_doneFirst = true;
        }
        /// <summary>
@@ -723,21 +479,29 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
                return;
            }
-            AutoBackupModuleState state = this.m_states[scene];
+            m_busy = true;
+            AutoBackupModuleState state;
+            if(!m_states.TryGetValue(scene, out state))
+                return;
+            if(state == null || !state.Enabled)
+                return;
            IRegionArchiverModule iram = scene.RequestModuleInterface<IRegionArchiverModule>();
+            if(iram == null)
+                return;
            string savePath = BuildOarPath(scene.RegionInfo.RegionName,
-                                                state.BackupDir,
+                                                m_backupDir,
                                                state.NamingType);
            if (savePath == null)
            {
                m_log.Warn("[AUTO BACKUP]: savePath is null in HandleElapsed");
                return;
            }
-            Guid guid = Guid.NewGuid();
-            m_pendingSaves.Add(guid, scene);
-            state.LiveRequests.Add(guid, savePath);
-            ((Scene) scene).EventManager.OnOarFileSaved += new EventManager.OarFileSaved(EventManager_OnOarFileSaved);
+            Guid guid = Guid.NewGuid();
            m_log.Info("[AUTO BACKUP]: Backing up region " + scene.RegionInfo.RegionName);
            // Must pass options, even if dictionary is empty!
@@ -747,47 +511,37 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
                options["noassets"] = true;
            iram.ArchiveRegion(savePath, guid, options);
+            ExecuteScript(state.Script, savePath);
        }
        // For the given state, remove backup files older than the states KeepFilesForDays property
-        private void RemoveOldFiles(AutoBackupModuleState state)
+        private void RemoveOldFiles()
        {
-            // 0 Means Disabled, Keep Files Indefinitely
+            string[] files;
-            if (state.KeepFilesForDays > 0)
+            try
            {
-                string[] files = Directory.GetFiles(state.BackupDir, "*.oar");
+                files = Directory.GetFiles(m_backupDir, "*.oar");
-                DateTime CuttOffDate = DateTime.Now.AddDays(0 - state.KeepFilesForDays);
+            }
+            catch (Exception Ex)
-                foreach (string file in files)
+            {
-                {
+                m_log.Error("[AUTO BACKUP]: Error reading backup folder " + m_backupDir + ": " + Ex.Message);
-                    try
+                return;
-                    {
-                        FileInfo fi = new FileInfo(file);
-                        if (fi.CreationTime < CuttOffDate)
-                            fi.Delete();
-                    }
-                    catch (Exception Ex)
-                    {
-                        m_log.Error("[AUTO BACKUP]: Error deleting old backup file '" + file + "': " + Ex.Message);
-                    }
-                }
            }
-        }
-        /// <summary>
+            DateTime CuttOffDate = DateTime.Now.AddDays(-m_KeepFilesForDays);
-        /// Called by the Event Manager when the OnOarFileSaved event is fired.
-        /// </summary>
+            foreach (string file in files)
-        /// <param name="guid"></param>
-        /// <param name="message"></param>
-        void EventManager_OnOarFileSaved(Guid guid, string message)
-        {
-            // Ignore if the OAR save is being done by some other part of the system
-            if (m_pendingSaves.ContainsKey(guid))
            {
-                AutoBackupModuleState abms = m_states[(m_pendingSaves[guid])];
+                try
-                ExecuteScript(abms.Script, abms.LiveRequests[guid]);
+                {
-                m_pendingSaves.Remove(guid);
+                    FileInfo fi = new FileInfo(file);
-                abms.LiveRequests.Remove(guid);
+                    if (fi.CreationTime < CuttOffDate)
+                        fi.Delete();
+                }
+                catch (Exception Ex)
+                {
+                    m_log.Error("[AUTO BACKUP]: Error deleting old backup file '" + file + "': " + Ex.Message);
+                }
            }
        }
@@ -817,63 +571,6 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
            return output;
        }
-        /// <summary>Return value of true ==> not too busy; false ==> too busy to backup an OAR right now, or error.</summary>
-        private bool RunHeuristics(IScene region)
-        {
-            try
-            {
-                return this.RunTimeDilationHeuristic(region) && this.RunAgentLimitHeuristic(region);
-            }
-            catch (Exception e)
-            {
-                m_log.Warn("[AUTO BACKUP]: Exception in RunHeuristics", e);
-                return false;
-            }
-        }
-        /// <summary>
-        /// If the time dilation right at this instant is less than the threshold specified in AutoBackupDilationThreshold (default 0.5),
-        /// then we return false and trip the busy heuristic's "too busy" path (i.e. don't save an OAR).
-        /// AutoBackupDilationThreshold is a _LOWER BOUND_. Lower Time Dilation is bad, so if you go lower than our threshold, it's "too busy".
-        /// </summary>
-        /// <param name="region"></param>
-        /// <returns>Returns true if we're not too busy; false means we've got worse time dilation than the threshold.</returns>
-        private bool RunTimeDilationHeuristic(IScene region)
-        {
-            string regionName = region.RegionInfo.RegionName;
-            return region.TimeDilation >=
-                   this.m_configSource.Configs["AutoBackupModule"].GetFloat(
-                       regionName + ".AutoBackupDilationThreshold", 0.5f);
-        }
-        /// <summary>
-        /// If the root agent count right at this instant is less than the threshold specified in AutoBackupAgentThreshold (default 10),
-        /// then we return false and trip the busy heuristic's "too busy" path (i.e., don't save an OAR).
-        /// AutoBackupAgentThreshold is an _UPPER BOUND_. Higher Agent Count is bad, so if you go higher than our threshold, it's "too busy".
-        /// </summary>
-        /// <param name="region"></param>
-        /// <returns>Returns true if we're not too busy; false means we've got more agents on the sim than the threshold.</returns>
-        private bool RunAgentLimitHeuristic(IScene region)
-        {
-            string regionName = region.RegionInfo.RegionName;
-            try
-            {
-                Scene scene = (Scene) region;
-                // TODO: Why isn't GetRootAgentCount() a method in the IScene interface? Seems generally useful...
-                return scene.GetRootAgentCount() <=
-                       this.m_configSource.Configs["AutoBackupModule"].GetInt(
-                           regionName + ".AutoBackupAgentThreshold", 10);
-            }
-            catch (InvalidCastException ice)
-            {
-                m_log.Debug(
-                    "[AUTO BACKUP]: I NEED MAINTENANCE: IScene is not a Scene; can't get root agent count!",
-                    ice);
-                return true;
-                // Non-obstructionist safest answer...
-            }
-        }
        /// <summary>
        /// Run the script or executable specified by the "AutoBackupScript" config setting.
        /// Of course this is a security risk if you let anyone modify OpenSim.ini and they want to run some nasty bash script.
@@ -920,18 +617,6 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
        }
        /// <summary>
-        /// Quickly stop all timers from firing.
-        /// </summary>
-        private void StopAllTimers()
-        {
-            foreach (Timer t in this.m_timerMap.Keys)
-            {
-                t.Close();
-            }
-            this.m_closed = true;
-        }
-        /// <summary>
        /// Determine the next unique filename by number, for "Sequential" AutoBackupNamingType.
        /// </summary>
        /// <param name="dirName"></param>
@@ -1033,5 +718,3 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
        }
    }
 }
diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs
index b90f0c4..fb87677 100644
--- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs
+++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModuleState.cs
@@ -38,26 +38,20 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
    ///
    public class AutoBackupModuleState
    {
-        private Dictionary<Guid, string> m_liveRequests = null;
        public AutoBackupModuleState()
        {
-            this.Enabled = false;
+            Enabled = false;
-            this.BackupDir = ".";
+            SkipAssets = false;
-            this.BusyCheck = true;
+            NamingType = NamingType.Time;
-            this.SkipAssets = false;
+            Script = null;
-            this.Timer = null;
-            this.NamingType = NamingType.Time;
-            this.Script = null;
-            this.KeepFilesForDays = 0;
        }
-        public Dictionary<Guid, string> LiveRequests
+        public AutoBackupModuleState(AutoBackupModuleState copyFrom)
        {
-            get {
+            Enabled = copyFrom.Enabled;
-                return this.m_liveRequests ??
+            SkipAssets = copyFrom.SkipAssets;
-                       (this.m_liveRequests = new Dictionary<Guid, string>(1));
+            NamingType = copyFrom.NamingType;
-            }
+            Script = copyFrom.Script;
        }
        public bool Enabled
@@ -66,33 +60,6 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
            set;
        }
-        public System.Timers.Timer Timer
-        {
-            get;
-            set;
-        }
-        public double IntervalMinutes
-        {
-            get
-            {
-                if (this.Timer == null)
-                {
-                    return -1.0;
-                }
-                else
-                {
-                    return this.Timer.Interval / 60000.0;
-                }
-            }
-        }
-        public bool BusyCheck
-        {
-            get;
-            set;
-        }
        public bool SkipAssets
        {
            get;
@@ -105,36 +72,19 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
            set;
        }
-        public string BackupDir
-        {
-            get;
-            set;
-        }
        public NamingType NamingType
        {
            get;
            set;
        }
-        public int KeepFilesForDays
-        {
-            get;
-            set;
-        }
        public new string ToString()
        {
            string retval = "";
            retval += "[AUTO BACKUP]: AutoBackup: " + (Enabled ? "ENABLED" : "DISABLED") + "\n";
-            retval += "[AUTO BACKUP]: Interval: " + IntervalMinutes + " minutes" + "\n";
-            retval += "[AUTO BACKUP]: Do Busy Check: " + (BusyCheck ? "Yes" : "No") + "\n";
            retval += "[AUTO BACKUP]: Naming Type: " + NamingType.ToString() + "\n";
-            retval += "[AUTO BACKUP]: Backup Dir: " + BackupDir + "\n";
            retval += "[AUTO BACKUP]: Script: " + Script + "\n";
            return retval;
        }
    }
 }
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index da8c9a3..6e1f8bb 100644
--- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
@@ -27,8 +27,13 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Reflection;
 using System.Timers;
+using System.Threading;
+using System.Xml;
+using System.Xml.Serialization;
 using OpenMetaverse;
 using log4net;
 using Mono.Addins;
@@ -38,9 +43,7 @@ using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using System.Xml;
+using Timer= System.Timers.Timer;
-using System.Xml.Serialization;
-using System.IO;
 namespace OpenSim.Region.OptionalModules.World.TreePopulator
 {
@@ -48,7 +51,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
    /// Version 2.02 - Still hacky
    /// </summary>
    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "TreePopulatorModule")]
-    public class TreePopulatorModule : INonSharedRegionModule, ICommandableModule, IVegetationModule
+    public class TreePopulatorModule : INonSharedRegionModule, ICommandableModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private readonly Commander m_commander = new Commander("tree");
@@ -82,20 +85,20 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
            {
                Copse cp = (Copse)DeserializeObject(fileName);
-                this.m_name = cp.m_name;
+                m_name = cp.m_name;
-                this.m_frozen = cp.m_frozen;
+                m_frozen = cp.m_frozen;
-                this.m_tree_quantity = cp.m_tree_quantity;
+                m_tree_quantity = cp.m_tree_quantity;
-                this.m_treeline_high = cp.m_treeline_high;
+                m_treeline_high = cp.m_treeline_high;
-                this.m_treeline_low = cp.m_treeline_low;
+                m_treeline_low = cp.m_treeline_low;
-                this.m_range = cp.m_range;
+                m_range = cp.m_range;
-                this.m_tree_type = cp.m_tree_type;
+                m_tree_type = cp.m_tree_type;
-                this.m_seed_point = cp.m_seed_point;
+                m_seed_point = cp.m_seed_point;
-                this.m_initial_scale = cp.m_initial_scale;
+                m_initial_scale = cp.m_initial_scale;
-                this.m_maximum_scale = cp.m_maximum_scale;
+                m_maximum_scale = cp.m_maximum_scale;
-                this.m_initial_scale = cp.m_initial_scale;
+                m_initial_scale = cp.m_initial_scale;
-                this.m_rate = cp.m_rate;
+                m_rate = cp.m_rate;
-                this.m_planted = planted;
+                m_planted = planted;
-                this.m_trees = new List<UUID>();
+                m_trees = new List<UUID>();
            }
            public Copse(string copsedef)
@@ -103,61 +106,63 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
                char[] delimiterChars = {':', ';'};
                string[] field = copsedef.Split(delimiterChars);
-                this.m_name = field[1].Trim();
+                m_name = field[1].Trim();
-                this.m_frozen = (copsedef[0] == 'F');
+                m_frozen = (copsedef[0] == 'F');
-                this.m_tree_quantity = int.Parse(field[2]);
+                m_tree_quantity = int.Parse(field[2]);
-                this.m_treeline_high = float.Parse(field[3], Culture.NumberFormatInfo);
+                m_treeline_high = float.Parse(field[3], Culture.NumberFormatInfo);
-                this.m_treeline_low = float.Parse(field[4], Culture.NumberFormatInfo);
+                m_treeline_low = float.Parse(field[4], Culture.NumberFormatInfo);
-                this.m_range = double.Parse(field[5], Culture.NumberFormatInfo);
+                m_range = double.Parse(field[5], Culture.NumberFormatInfo);
-                this.m_tree_type = (Tree) Enum.Parse(typeof(Tree),field[6]);
+                m_tree_type = (Tree) Enum.Parse(typeof(Tree),field[6]);
-                this.m_seed_point = Vector3.Parse(field[7]);
+                m_seed_point = Vector3.Parse(field[7]);
-                this.m_initial_scale = Vector3.Parse(field[8]);
+                m_initial_scale = Vector3.Parse(field[8]);
-                this.m_maximum_scale = Vector3.Parse(field[9]);
+                m_maximum_scale = Vector3.Parse(field[9]);
-                this.m_rate = Vector3.Parse(field[10]);
+                m_rate = Vector3.Parse(field[10]);
-                this.m_planted = true;
+                m_planted = true;
-                this.m_trees = new List<UUID>();
+                m_trees = new List<UUID>();
            }
            public Copse(string name, int quantity, float high, float low, double range, Vector3 point, Tree type, Vector3 scale, Vector3 max_scale, Vector3 rate, List<UUID> trees)
            {
-                this.m_name = name;
+                m_name = name;
-                this.m_frozen = false;
+                m_frozen = false;
-                this.m_tree_quantity = quantity;
+                m_tree_quantity = quantity;
-                this.m_treeline_high = high;
+                m_treeline_high = high;
-                this.m_treeline_low = low;
+                m_treeline_low = low;
-                this.m_range = range;
+                m_range = range;
-                this.m_tree_type = type;
+                m_tree_type = type;
-                this.m_seed_point = point;
+                m_seed_point = point;
-                this.m_initial_scale = scale;
+                m_initial_scale = scale;
-                this.m_maximum_scale = max_scale;
+                m_maximum_scale = max_scale;
-                this.m_rate = rate;
+                m_rate = rate;
-                this.m_planted = false;
+                m_planted = false;
-                this.m_trees = trees;
+                m_trees = trees;
            }
            public override string ToString()
            {
-                string frozen = (this.m_frozen ? "F" : "A");
+                string frozen = (m_frozen ? "F" : "A");
                return string.Format("{0}TPM: {1}; {2}; {3:0.0}; {4:0.0}; {5:0.0}; {6}; {7:0.0}; {8:0.0}; {9:0.0}; {10:0.00};",
                    frozen,
-                    this.m_name,
+                    m_name,
-                    this.m_tree_quantity,
+                    m_tree_quantity,
-                    this.m_treeline_high,
+                    m_treeline_high,
-                    this.m_treeline_low,
+                    m_treeline_low,
-                    this.m_range,
+                    m_range,
-                    this.m_tree_type,
+                    m_tree_type,
-                    this.m_seed_point.ToString(),
+                    m_seed_point.ToString(),
-                    this.m_initial_scale.ToString(),
+                    m_initial_scale.ToString(),
-                    this.m_maximum_scale.ToString(),
+                    m_maximum_scale.ToString(),
-                    this.m_rate.ToString());
+                    m_rate.ToString());
            }
        }
-        private List<Copse> m_copse;
+        private List<Copse> m_copses = new List<Copse>();
+        private object mylock;
        private double m_update_ms = 1000.0; // msec between updates
        private bool m_active_trees = false;
+        private bool m_enabled = true; // original default
+        private bool m_allowGrow = true; // original default
        Timer CalculateTrees;
@@ -174,51 +179,51 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
        public void Initialise(IConfigSource config)
        {
+            IConfig moduleConfig = config.Configs["Trees"];
-            // ini file settings
+            if (moduleConfig != null)
-            try
-            {
-                m_active_trees = config.Configs["Trees"].GetBoolean("active_trees", m_active_trees);
-            }
-            catch (Exception)
            {
-                m_log.Debug("[TREES]: ini failure for active_trees - using default");
+                m_enabled = moduleConfig.GetBoolean("enabled", m_enabled);
+                m_active_trees = moduleConfig.GetBoolean("active_trees", m_active_trees);
+                m_allowGrow = moduleConfig.GetBoolean("allowGrow", m_allowGrow);
+                m_update_ms = moduleConfig.GetDouble("update_rate", m_update_ms);
            }
-            try
+            if(!m_enabled)
-            {
+                return;
-                m_update_ms = config.Configs["Trees"].GetDouble("update_rate", m_update_ms);
-            }
+            m_copses =  new List<Copse>();
-            catch (Exception)
+            mylock = new object();
-            {
-                m_log.Debug("[TREES]: ini failure for update_rate - using default");
-            }
            InstallCommands();
-            m_log.Debug("[TREES]: Initialised tree module");
+            m_log.Debug("[TREES]: Initialised tree populator module");
        }
        public void AddRegion(Scene scene)
        {
+            if(!m_enabled)
+                return;
            m_scene = scene;
            m_scene.RegisterModuleCommander(m_commander);
            m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
+            m_scene.EventManager.OnPrimsLoaded += EventManager_OnPrimsLoaded;
        }
        public void RemoveRegion(Scene scene)
        {
-        }
+            if(!m_enabled)
+                return;
+            if(m_active_trees && CalculateTrees != null)
+            {
+                CalculateTrees.Dispose();
+                CalculateTrees = null;
+            }
+            m_scene.EventManager.OnPluginConsole -= EventManager_OnPluginConsole;
+            m_scene.EventManager.OnPrimsLoaded -= EventManager_OnPrimsLoaded;
+        }   
        public void RegionLoaded(Scene scene)
        {
-            ReloadCopse();
-            if (m_copse.Count > 0)
-                m_log.Info("[TREES]: Copse load complete");
-            if (m_active_trees)
-                activeizeTreeze(true);
        }
        public void Close()
@@ -240,6 +245,16 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
        //--------------------------------------------------------------
+        private void EventManager_OnPrimsLoaded(Scene s)
+        {
+            ReloadCopse();
+            if (m_copses.Count > 0)
+                m_log.Info("[TREES]: Copses loaded" );
+            if (m_active_trees)
+                activeizeTreeze(true);
+        }
        #region ICommandableModule Members
        private void HandleTreeActive(Object[] args)
@@ -267,25 +282,57 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
            string copsename = ((string)args[0]).Trim();
            Boolean freezeState = (Boolean) args[1];
-            foreach (Copse cp in m_copse)
+            lock(mylock)
            {
-                if (cp.m_name == copsename && (!cp.m_frozen && freezeState || cp.m_frozen && !freezeState))
+                foreach (Copse cp in m_copses)
                {
-                    cp.m_frozen = freezeState;
+                    if (cp.m_name != copsename)
-                    foreach (UUID tree in cp.m_trees)
+                        continue;
+                    if(!cp.m_frozen && freezeState || cp.m_frozen && !freezeState)
                    {
-                        SceneObjectPart sop = ((SceneObjectGroup)m_scene.Entities[tree]).RootPart;
+                        cp.m_frozen = freezeState;
-                        sop.Name = (freezeState ? sop.Name.Replace("ATPM", "FTPM") : sop.Name.Replace("FTPM", "ATPM"));
+                        List<UUID> losttrees = new List<UUID>();
-                        sop.ParentGroup.HasGroupChanged = true;
+                        foreach (UUID tree in cp.m_trees)
-                    }
+                        {
+                            SceneObjectGroup sog = m_scene.GetSceneObjectGroup(tree);
+                            if(sog != null && !sog.IsDeleted)
+                            {
+                                SceneObjectPart sop = sog.RootPart;
+                                string name = sop.Name;
+                                if(freezeState)
+                                {
+                                    if(name.StartsWith("FTPM"))
+                                        continue;
+                                    if(!name.StartsWith("ATPM"))
+                                        continue;
+                                    sop.Name = sop.Name.Replace("ATPM", "FTPM");
+                                }
+                                else
+                                {
+                                    if(name.StartsWith("ATPM"))
+                                        continue;
+                                    if(!name.StartsWith("FTPM"))
+                                        continue;
+                                    sop.Name = sop.Name.Replace("FTPM", "ATPM");
+                                }
+                                sop.ParentGroup.HasGroupChanged = true;
+                                sog.ScheduleGroupForFullUpdate();
+                            }
+                            else
+                               losttrees.Add(tree);
+                        }
+                        foreach (UUID tree in losttrees)
+                            cp.m_trees.Remove(tree);
-                    m_log.InfoFormat("[TREES]: Activity for copse {0} is frozen {1}", copsename, freezeState);
+                        m_log.InfoFormat("[TREES]: Activity for copse {0} is frozen {1}", copsename, freezeState);
-                    return;
+                        return;
-                }
+                    }
-                else if (cp.m_name == copsename && (cp.m_frozen && freezeState || !cp.m_frozen && !freezeState))
+                    else
-                {
+                    {
-                    m_log.InfoFormat("[TREES]: Copse {0} is already in the requested freeze state", copsename);
+                        m_log.InfoFormat("[TREES]: Copse {0} is already in the requested freeze state", copsename);
-                    return;
+                        return;
+                    }
                }
            }
            m_log.InfoFormat("[TREES]: Copse {0} was not found - command failed", copsename);
@@ -297,17 +344,21 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
            m_log.InfoFormat("[TREES]: Loading copse definition....");
-            copse = new Copse(((string)args[0]), false);
+            lock(mylock)
-            foreach (Copse cp in m_copse)
            {
-                if (cp.m_name == copse.m_name)
+                copse = new Copse(((string)args[0]), false);
                {
-                    m_log.InfoFormat("[TREES]: Copse: {0} is already defined - command failed", copse.m_name);
+                    foreach (Copse cp in m_copses)
-                    return;
+                    {
+                        if (cp.m_name == copse.m_name)
+                        {
+                            m_log.InfoFormat("[TREES]: Copse: {0} is already defined - command failed", copse.m_name);
+                            return;
+                        }
+                    }
                }
+                m_copses.Add(copse);
            }
-            m_copse.Add(copse);
            m_log.InfoFormat("[TREES]: Loaded copse: {0}", copse.ToString());
        }
@@ -318,20 +369,24 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
            m_log.InfoFormat("[TREES]: New tree planting for copse {0}", copsename);
            UUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner;
-            foreach (Copse copse in m_copse)
+            lock(mylock)
            {
-                if (copse.m_name == copsename)
+                foreach (Copse copse in m_copses)
                {
-                    if (!copse.m_planted)
+                    if (copse.m_name == copsename)
-                    {
-                        // The first tree for a copse is created here
-                        CreateTree(uuid, copse, copse.m_seed_point);
-                        copse.m_planted = true;
-                        return;
-                    }
-                    else
                    {
-                        m_log.InfoFormat("[TREES]: Copse {0} has already been planted", copsename);
+                        if (!copse.m_planted)
+                        {
+                            // The first tree for a copse is created here
+                            CreateTree(uuid, copse, copse.m_seed_point, true);
+                            copse.m_planted = true;
+                            return;
+                        }
+                        else
+                        {
+                            m_log.InfoFormat("[TREES]: Copse {0} has already been planted", copsename);
+                            return;
+                        }
                    }
                }
            }
@@ -376,45 +431,49 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
            string copsename = ((string)args[0]).Trim();
            Copse copseIdentity = null;
-            foreach (Copse cp in m_copse)
+            lock(mylock)
            {
-                if (cp.m_name == copsename)
+                foreach (Copse cp in m_copses)
                {
-                    copseIdentity = cp;
+                    if (cp.m_name == copsename)
+                    {
+                        copseIdentity = cp;
+                    }
                }
-            }
-            if (copseIdentity != null)
+                if (copseIdentity != null)
-            {
-                foreach (UUID tree in copseIdentity.m_trees)
                {
-                    if (m_scene.Entities.ContainsKey(tree))
+                    foreach (UUID tree in copseIdentity.m_trees)
                    {
-                        SceneObjectPart selectedTree = ((SceneObjectGroup)m_scene.Entities[tree]).RootPart;
+                        if (m_scene.Entities.ContainsKey(tree))
-                        // Delete tree and alert clients (not silent)
+                        {
-                        m_scene.DeleteSceneObject(selectedTree.ParentGroup, false);
+                            SceneObjectPart selectedTree = ((SceneObjectGroup)m_scene.Entities[tree]).RootPart;
-                    }
+                            // Delete tree and alert clients (not silent)
-                    else
+                            m_scene.DeleteSceneObject(selectedTree.ParentGroup, false);
-                    {
+                        }
-                        m_log.DebugFormat("[TREES]: Tree not in scene {0}", tree);
+                        else
+                        {
+                            m_log.DebugFormat("[TREES]: Tree not in scene {0}", tree);
+                        }
                    }
+                    copseIdentity.m_trees = null;
+                    m_copses.Remove(copseIdentity);
+                    m_log.InfoFormat("[TREES]: Copse {0} has been removed", copsename);
+                }
+                else
+                {
+                    m_log.InfoFormat("[TREES]: Copse {0} was not found - command failed", copsename);
                }
-                copseIdentity.m_trees = new List<UUID>();
-                m_copse.Remove(copseIdentity);
-                m_log.InfoFormat("[TREES]: Copse {0} has been removed", copsename);
-            }
-            else
-            {
-                m_log.InfoFormat("[TREES]: Copse {0} was not found - command failed", copsename);
            }
        }
        private void HandleTreeStatistics(Object[] args)
        {
-            m_log.InfoFormat("[TREES]: Activity State: {0};  Update Rate: {1}", m_active_trees, m_update_ms);
+            m_log.InfoFormat("[TREES]: region {0}:", m_scene.Name);
-            foreach (Copse cp in m_copse)
+            m_log.InfoFormat("[TREES]:    Activity State: {0};  Update Rate: {1}", m_active_trees, m_update_ms);
+            foreach (Copse cp in m_copses)
            {
-                m_log.InfoFormat("[TREES]: Copse {0}; {1} trees; frozen {2}", cp.m_name, cp.m_trees.Count, cp.m_frozen);
+                m_log.InfoFormat("[TREES]:    Copse {0}; {1} trees; frozen {2}", cp.m_name, cp.m_trees.Count, cp.m_frozen);
            }
        }
@@ -442,7 +501,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
            treeRateCommand.AddArgument("updateRate", "The required update rate (minimum 1000.0)", "Double");
            Command treeReloadCommand =
-                new Command("reload", CommandIntentions.COMMAND_HAZARDOUS, HandleTreeReload, "Reload copse definitions from the in-scene trees");
+                new Command("reload", CommandIntentions.COMMAND_HAZARDOUS, HandleTreeReload, "Reload copses from the in-scene trees");
            Command treeRemoveCommand =
                new Command("remove", CommandIntentions.COMMAND_HAZARDOUS, HandleTreeRemove, "Remove a copse definition and all its in-scene trees");
@@ -499,34 +558,17 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
            treeShape.Scale = scale;
            treeShape.State = (byte)treeType;
-            return m_scene.AddNewPrim(uuid, groupID, position, rotation, treeShape);
+            SceneObjectGroup sog = new SceneObjectGroup(uuid, position, rotation, treeShape);
-        }
+            SceneObjectPart rootPart = sog.RootPart;
-        #endregion
-        #region IEntityCreator Members
-        protected static readonly PCode[] creationCapabilities = new PCode[] { PCode.NewTree, PCode.Tree };
-        public PCode[] CreationCapabilities { get { return creationCapabilities; } }
-        public SceneObjectGroup CreateEntity(
-            UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
-        {
-            if (Array.IndexOf(creationCapabilities, (PCode)shape.PCode) < 0)
-            {
-                m_log.DebugFormat("[VEGETATION]: PCode {0} not handled by {1}", shape.PCode, Name);
-                return null;
-            }
-            SceneObjectGroup sceneObject = new SceneObjectGroup(ownerID, pos, rot, shape);
-            SceneObjectPart rootPart = sceneObject.GetPart(sceneObject.UUID);
            rootPart.AddFlag(PrimFlags.Phantom);
-            sceneObject.SetGroup(groupID, null);
+            sog.SetGroup(groupID, null);
-            m_scene.AddNewSceneObject(sceneObject, true);
+            m_scene.AddNewSceneObject(sog, true, false);
-            sceneObject.InvalidateEffectivePerms();
+            sog.IsSelected = false;
-            return sceneObject;
+            rootPart.IsSelected = false;
+            sog.InvalidateEffectivePerms();
+            return sog;
        }
        #endregion
@@ -569,26 +611,27 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
        private void ReloadCopse()
        {
-            m_copse = new List<Copse>();
+            m_copses = new List<Copse>();
-            EntityBase[] objs = m_scene.GetEntities();
+            List<SceneObjectGroup> grps = m_scene.GetSceneObjectGroups();
-            foreach (EntityBase obj in objs)
+            foreach (SceneObjectGroup grp in grps)
            {
-                if (obj is SceneObjectGroup)
+                if(grp.RootPart.Shape.PCode != (byte)PCode.NewTree && grp.RootPart.Shape.PCode != (byte)PCode.Tree)
-                {
+                    continue;
-                    SceneObjectGroup grp = (SceneObjectGroup)obj;
-                    if (grp.Name.Length > 5 && (grp.Name.Substring(0, 5) == "ATPM:" || grp.Name.Substring(0, 5) == "FTPM:"))
+                if (grp.Name.Length > 5 && (grp.Name.Substring(0, 5) == "ATPM:" || grp.Name.Substring(0, 5) == "FTPM:"))
+                {
+                    // Create a new copse definition or add uuid to an existing definition
+                    try
                    {
-                        // Create a new copse definition or add uuid to an existing definition
+                        Boolean copsefound = false;
-                        try
+                        Copse grpcopse = new Copse(grp.Name);
-                        {
-                            Boolean copsefound = false;
-                            Copse copse = new Copse(grp.Name);
-                            foreach (Copse cp in m_copse)
+                        lock(mylock)
+                        {
+                            foreach (Copse cp in m_copses)
                            {
-                                if (cp.m_name == copse.m_name)
+                                if (cp.m_name == grpcopse.m_name)
                                {
                                    copsefound = true;
                                    cp.m_trees.Add(grp.UUID);
@@ -598,15 +641,15 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
                            if (!copsefound)
                            {
-                                m_log.InfoFormat("[TREES]: Found copse {0}", grp.Name);
+                                m_log.InfoFormat("[TREES]: adding copse {0}", grpcopse.m_name);
-                                m_copse.Add(copse);
+                                grpcopse.m_trees.Add(grp.UUID);
-                                copse.m_trees.Add(grp.UUID);
+                                m_copses.Add(grpcopse);
                            }
                        }
-                        catch
+                    }
-                        {
+                    catch
-                            m_log.InfoFormat("[TREES]: Ill formed copse definition {0} - ignoring", grp.Name);
+                    {
-                        }
+                        m_log.InfoFormat("[TREES]: Ill formed copse definition {0} - ignoring", grp.Name);
                    }
                }
            }
@@ -617,8 +660,10 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
        {
            if (activeYN)
            {
-                CalculateTrees = new Timer(m_update_ms);
+                if(CalculateTrees == null)
+                    CalculateTrees = new Timer(m_update_ms);
                CalculateTrees.Elapsed += CalculateTrees_Elapsed;
+                CalculateTrees.AutoReset = false;
                CalculateTrees.Start();
            }
            else
@@ -629,154 +674,251 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
        private void growTrees()
        {
-            foreach (Copse copse in m_copse)
+            if(!m_allowGrow)
+                return;
+            foreach (Copse copse in m_copses)
            {
-                if (!copse.m_frozen)
+                if (copse.m_frozen)
+                    continue;
+                if(copse.m_trees.Count == 0)
+                    continue;
+                float maxscale = copse.m_maximum_scale.Z;
+                float ratescale = 1.0f;
+                List<UUID> losttrees = new List<UUID>();
+                foreach (UUID tree in copse.m_trees)
                {
-                    foreach (UUID tree in copse.m_trees)
+                    SceneObjectGroup sog = m_scene.GetSceneObjectGroup(tree);
-                    {
-                        if (m_scene.Entities.ContainsKey(tree))
-                        {
-                            SceneObjectPart s_tree = ((SceneObjectGroup)m_scene.Entities[tree]).RootPart;
-                            if (s_tree.Scale.X < copse.m_maximum_scale.X && s_tree.Scale.Y < copse.m_maximum_scale.Y && s_tree.Scale.Z < copse.m_maximum_scale.Z)
+                    if (sog != null && !sog.IsDeleted)
-                            {
+                    {
-                                s_tree.Scale += copse.m_rate;
+                        SceneObjectPart s_tree = sog.RootPart;
-                                s_tree.ParentGroup.HasGroupChanged = true;
+                        if (s_tree.Scale.Z < maxscale)
-                                s_tree.ScheduleFullUpdate();
-                            }
-                        }
-                        else
                        {
-                            m_log.DebugFormat("[TREES]: Tree not in scene {0}", tree);
+                            ratescale = (float)Util.RandomClass.NextDouble();
+                            if(ratescale < 0.2f)
+                                ratescale = 0.2f;
+                            s_tree.Scale += copse.m_rate * ratescale;
+                            sog.HasGroupChanged = true;
+                            s_tree.ScheduleFullUpdate();
                        }
                    }
+                    else
+                        losttrees.Add(tree);
                }
+                foreach (UUID tree in losttrees)
+                    copse.m_trees.Remove(tree);
            }
        }
        private void seedTrees()
        {
-            foreach (Copse copse in m_copse)
+            foreach (Copse copse in m_copses)
            {
-                if (!copse.m_frozen)
+                if (copse.m_frozen)
+                    continue;
+                if(copse.m_trees.Count == 0)
+                    return;
+                bool low = copse.m_trees.Count < (int)(copse.m_tree_quantity * 0.8f);
+                if (!low && Util.RandomClass.NextDouble() < 0.75)
+                    return;
+                int maxbirths =  (int)(copse.m_tree_quantity) - copse.m_trees.Count;
+                if(maxbirths <= 1)
+                    return;
+                if(maxbirths > 20)
+                    maxbirths = 20;
+                float minscale = 0;
+                if(!low && m_allowGrow)
+                    minscale = copse.m_maximum_scale.Z * 0.75f;;
+                int i = 0;
+                UUID[] current = copse.m_trees.ToArray();
+                while(--maxbirths > 0)
                {
-                    foreach (UUID tree in copse.m_trees)
+                    if(current.Length > 1)
+                        i = Util.RandomClass.Next(current.Length -1);
+                    UUID tree = current[i];
+                    SceneObjectGroup sog = m_scene.GetSceneObjectGroup(tree);
+                    if (sog != null && !sog.IsDeleted)
                    {
-                        if (m_scene.Entities.ContainsKey(tree))
+                        SceneObjectPart s_tree = sog.RootPart;
-                        {
-                            SceneObjectPart s_tree = ((SceneObjectGroup)m_scene.Entities[tree]).RootPart;
-                            if (copse.m_trees.Count < copse.m_tree_quantity)
+                        // Tree has grown enough to seed if it has grown by at least 25% of seeded to full grown height
-                            {
+                        if (s_tree.Scale.Z > minscale)
-                                // Tree has grown enough to seed if it has grown by at least 25% of seeded to full grown height
+                                SpawnChild(copse, s_tree, true);
-                                if (s_tree.Scale.Z > copse.m_initial_scale.Z + (copse.m_maximum_scale.Z - copse.m_initial_scale.Z) / 4.0)
-                                {
-                                    if (Util.RandomClass.NextDouble() > 0.75)
-                                    {
-                                        SpawnChild(copse, s_tree);
-                                    }
-                                }
-                            }
-                        }
-                        else
-                        {
-                            m_log.DebugFormat("[TREES]: Tree not in scene {0}", tree);
-                        }
                    }
-                }
+                    else if(copse.m_trees.Contains(tree))
+                        copse.m_trees.Remove(tree);
+                }                   
            }
        }
        private void killTrees()
        {
-            foreach (Copse copse in m_copse)
+            foreach (Copse copse in m_copses)
            {
-                if (!copse.m_frozen && copse.m_trees.Count >= copse.m_tree_quantity)
+                if (copse.m_frozen)
-                {
+                    continue;
-                    foreach (UUID tree in copse.m_trees)
-                    {
-                        double killLikelyhood = 0.0;
-                        if (m_scene.Entities.ContainsKey(tree))
-                        {
-                            SceneObjectPart selectedTree = ((SceneObjectGroup)m_scene.Entities[tree]).RootPart;
-                            double selectedTreeScale = Math.Sqrt(Math.Pow(selectedTree.Scale.X, 2) +
-                                                                 Math.Pow(selectedTree.Scale.Y, 2) +
-                                                                 Math.Pow(selectedTree.Scale.Z, 2));
-                            foreach (UUID picktree in copse.m_trees)
+                if (Util.RandomClass.NextDouble() < 0.25)
-                            {
+                    return;
-                                if (picktree != tree)
-                                {
-                                    SceneObjectPart pickedTree = ((SceneObjectGroup)m_scene.Entities[picktree]).RootPart;
-                                    double pickedTreeScale = Math.Sqrt(Math.Pow(pickedTree.Scale.X, 2) +
-                                                                       Math.Pow(pickedTree.Scale.Y, 2) +
-                                                                       Math.Pow(pickedTree.Scale.Z, 2));
-                                    double pickedTreeDistance = Vector3.Distance(pickedTree.AbsolutePosition, selectedTree.AbsolutePosition);
+                int maxbdeaths = copse.m_trees.Count - (int)(copse.m_tree_quantity * .98f) ;
+                if(maxbdeaths < 1)
+                    return;
-                                    killLikelyhood += (selectedTreeScale / (pickedTreeScale * pickedTreeDistance)) * 0.1;
+                float odds;
-                                }
+                float scale = 1.0f / copse.m_maximum_scale.Z;
-                            }
-                            if (Util.RandomClass.NextDouble() < killLikelyhood)
+                int ntries = maxbdeaths * 4;
-                            {
+                while(ntries-- > 0 )
-                                // Delete tree and alert clients (not silent)
+                {
-                                m_scene.DeleteSceneObject(selectedTree.ParentGroup, false);
+                    int next = 0;
-                                copse.m_trees.Remove(selectedTree.ParentGroup.UUID);
+                    if (copse.m_trees.Count > 1)
-                                break;
+                        next = Util.RandomClass.Next(copse.m_trees.Count - 1);
-                            }
+                    UUID tree = copse.m_trees[next];
+                    SceneObjectGroup sog = m_scene.GetSceneObjectGroup(tree);
+                    if (sog != null && !sog.IsDeleted)
+                    {
+                        if(m_allowGrow)
+                        {
+                            odds = sog.RootPart.Scale.Z * scale;
+                            odds = odds * odds * odds;
+                            odds *= (float)Util.RandomClass.NextDouble();
                        }
                        else
                        {
-                            m_log.DebugFormat("[TREES]: Tree not in scene {0}", tree);
+                            odds = (float)Util.RandomClass.NextDouble();
+                            odds = odds * odds * odds;
+                        }
+                        if(odds > 0.9f)
+                        {
+                            m_scene.DeleteSceneObject(sog, false);
+                            if(maxbdeaths <= 0)
+                                break;
                        }
+                    }            
+                    else
+                    {
+                        copse.m_trees.Remove(tree);
+                        if(copse.m_trees.Count - (int)(copse.m_tree_quantity * .98f) <= 0 )
+                            break;
                    }
                }
            }
        }
-        private void SpawnChild(Copse copse, SceneObjectPart s_tree)
+        private void SpawnChild(Copse copse, SceneObjectPart s_tree, bool low)
        {
            Vector3 position = new Vector3();
+           
-            double randX = ((Util.RandomClass.NextDouble() * 2.0) - 1.0) * (s_tree.Scale.X * 3);
+            float randX = copse.m_maximum_scale.X * 1.25f;
-            double randY = ((Util.RandomClass.NextDouble() * 2.0) - 1.0) * (s_tree.Scale.X * 3);
+            float randY = copse.m_maximum_scale.Y * 1.25f;
+            
+            float r = (float)Util.RandomClass.NextDouble();
+            randX *=  2.0f * r - 1.0f;
            position.X = s_tree.AbsolutePosition.X + (float)randX;
+            
+            r = (float)Util.RandomClass.NextDouble();
+            randY *=  2.0f * r - 1.0f;
            position.Y = s_tree.AbsolutePosition.Y + (float)randY;
-            if (position.X <= (m_scene.RegionInfo.RegionSizeX - 1) && position.X >= 0 &&
+            if (position.X > (m_scene.RegionInfo.RegionSizeX - 1) || position.X <= 0 ||
-                position.Y <= (m_scene.RegionInfo.RegionSizeY - 1) && position.Y >= 0 &&
+                position.Y > (m_scene.RegionInfo.RegionSizeY - 1) || position.Y <= 0)
-                Util.GetDistanceTo(position, copse.m_seed_point) <= copse.m_range)
+                return;
-            {
-                UUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner;
-                CreateTree(uuid, copse, position);
+            randX = position.X - copse.m_seed_point.X;
-            }
+            randX *= randX;
+            randY = position.Y - copse.m_seed_point.Y;
+            randY *= randY;
+            randX += randY;
+            if(randX > copse.m_range * copse.m_range)
+                return;
+            UUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner;
+            CreateTree(uuid, copse, position, low);
        }
-        private void CreateTree(UUID uuid, Copse copse, Vector3 position)
+        private void CreateTree(UUID uuid, Copse copse, Vector3 position, bool randomScale)
        {
            position.Z = (float)m_scene.Heightmap[(int)position.X, (int)position.Y];
-            if (position.Z >= copse.m_treeline_low && position.Z <= copse.m_treeline_high)
+            if (position.Z < copse.m_treeline_low || position.Z > copse.m_treeline_high)
-            {
+                return;
-                SceneObjectGroup tree = AddTree(uuid, UUID.Zero, copse.m_initial_scale, Quaternion.Identity, position, copse.m_tree_type, false);
-                tree.Name = copse.ToString();
+            Vector3 scale = copse.m_initial_scale;
-                copse.m_trees.Add(tree.UUID);
+            if(randomScale)
-                tree.SendGroupFullUpdate();
+            {
+                try
+                {
+                    float t;
+                    float r = (float)Util.RandomClass.NextDouble();
+                    r *= (float)Util.RandomClass.NextDouble();
+                    r *= (float)Util.RandomClass.NextDouble();
+                    t = copse.m_maximum_scale.X / copse.m_initial_scale.X;
+                    if(t < 1.0)
+                        t = 1 / t;
+                    t = t * r + 1.0f;
+                    scale.X *= t;
+                    t = copse.m_maximum_scale.Y / copse.m_initial_scale.Y;
+                    if(t < 1.0)
+                        t = 1 / t;
+                    t = t * r + 1.0f;
+                    scale.Y *= t;
+                    t = copse.m_maximum_scale.Z / copse.m_initial_scale.Z;
+                    if(t < 1.0)
+                        t = 1 / t;
+                    t = t * r + 1.0f;
+                    scale.Z *= t;
+                }
+                catch
+                {
+                    scale = copse.m_initial_scale;
+                }
            }
+            SceneObjectGroup tree = AddTree(uuid, UUID.Zero, scale, Quaternion.Identity, position, copse.m_tree_type, false);
+            tree.Name = copse.ToString();
+            copse.m_trees.Add(tree.UUID);
+            tree.RootPart.ScheduleFullUpdate();
        }
        private void CalculateTrees_Elapsed(object sender, ElapsedEventArgs e)
        {
-            growTrees();
+            if(!m_scene.IsRunning)
-            seedTrees();
+                return;
-            killTrees();
+            
+            if(Monitor.TryEnter(mylock))
+            {
+                try
+                {
+                    if(m_scene.LoginsEnabled )
+                    {
+                        growTrees();
+                        seedTrees();
+                        killTrees();
+                    }
+                }
+                catch { }
+                if(CalculateTrees != null)
+                    CalculateTrees.Start();
+                Monitor.Exit(mylock);
+            }
        }
    }
 }
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
index de7e879..0e46471 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        public float walkDivisor = 1.3f;
        public float runDivisor = 0.8f;
-        private bool flying = false;
+        private bool m_flying = false;
        private bool m_iscolliding = false;
        private bool m_iscollidingGround = false;
        private bool m_iscollidingObj = false;
@@ -298,10 +298,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        public override bool Flying
        {
-            get { return flying; }
+            get { return m_flying; }
            set
            {
-                flying = value;
+                m_flying = value;
 //                m_log.DebugFormat("[PHYSICS]: Set OdeCharacter Flying to {0}", flying);
            }
        }
@@ -899,9 +899,9 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            y = tx * sin + y * cos;
        }
-        public bool Collide(IntPtr me, IntPtr other, bool reverse, ref d.ContactGeom contact,
+            public bool Collide(IntPtr me, IntPtr other, bool reverse, ref d.ContactGeom contact,
                ref d.ContactGeom altContact , ref bool useAltcontact, ref bool feetcollision)
-        {
+            {
            feetcollision = false;
            useAltcontact = false;
@@ -943,12 +943,13 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    }
                    return true;
                }
-/*
-                d.AABB aabb;
+                if (gtype == d.GeomClassID.SphereClass && d.GeomGetBody(other) != IntPtr.Zero)
-                d.GeomGetAABB(other,out aabb);
+                {
-                float othertop = aabb.MaxZ - _position.Z;
+                    if(d.GeomSphereGetRadius(other) < 0.5)
-*/
+                        return true;
-//                if (offset.Z > 0 || othertop > -feetOff || contact.normal.Z > 0.35f)
+                }
                if (offset.Z > 0 || contact.normal.Z > 0.35f)
                {
                    if (offset.Z <= 0)
@@ -965,6 +966,18 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    return true;
                }
+                if(m_flying)
+                    return true;
+                feetcollision = true;
+                if (h < boneOff)
+                {
+                    m_collideNormal.X = contact.normal.X;
+                    m_collideNormal.Y = contact.normal.Y;
+                    m_collideNormal.Z = contact.normal.Z;
+                    IsColliding = true;
+                }
                altContact = contact;
                useAltcontact = true;
@@ -972,8 +985,21 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                offset.Normalize();
-                if (contact.depth > 0.1f)
+                float tdp = contact.depth;
-                    contact.depth = 0.1f;
+                float t = offset.X;
+                t = Math.Abs(t);
+                if(t > 1e-6)
+                {
+                   tdp /= t;
+                   tdp *= contact.normal.X;
+                }
+                else
+                    tdp *= 10;
+                if (tdp > 0.25f)
+                    tdp = 0.25f;
+                altContact.depth = tdp;
                if (reverse)
                {
@@ -987,15 +1013,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    altContact.normal.Y = -offset.Y;
                    altContact.normal.Z = -offset.Z;
                }
-                feetcollision = true;
-                if (h < boneOff)
-                {
-                    m_collideNormal.X = contact.normal.X;
-                    m_collideNormal.Y = contact.normal.Y;
-                    m_collideNormal.Z = contact.normal.Z;
-                    IsColliding = true;
-                }
                return true;
            }
            return false;
@@ -1098,7 +1115,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            float ftmp;
-            if (flying)
+            if (m_flying)
            {
                ftmp = timeStep;
                posch.X += vel.X * ftmp;
@@ -1122,7 +1139,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                vec.Z = depth * PID_P * 50;
-                if (!flying)
+                if (!m_flying)
                {
                    vec.Z += -vel.Z * PID_D;
                    if(n.Z < 0.4f)
@@ -1259,7 +1276,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                // movement relative to surface if moving on it
                // dont disturbe vertical movement, ie jumps
-                if (m_iscolliding && !flying && ctz.Z == 0 && m_collideNormal.Z > 0.2f && m_collideNormal.Z < 0.94f)
+                if (m_iscolliding && !m_flying && ctz.Z == 0 && m_collideNormal.Z > 0.2f && m_collideNormal.Z < 0.94f)
                {
                    float p = ctz.X * m_collideNormal.X + ctz.Y * m_collideNormal.Y;
                    ctz.X *= (float)Math.Sqrt(1 - m_collideNormal.X * m_collideNormal.X);
@@ -1276,7 +1293,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            {
                //  if velocity is zero, use position control; otherwise, velocity control
-                if (tviszero && m_iscolliding && !flying)
+                if (tviszero && m_iscolliding && !m_flying)
                {
                    //  keep track of where we stopped.  No more slippin' & slidin'
                    if (!_zeroFlag)
@@ -1313,7 +1330,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    if (m_iscolliding)
                    {
-                        if (!flying)
+                        if (!m_flying)
                        {
                            // we are on a surface
                            if (ctz.Z > 0f)
@@ -1361,7 +1378,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    }
                    else // ie not colliding
                    {
-                        if (flying || hoverPIDActive) //(!m_iscolliding && flying)
+                        if (m_flying || hoverPIDActive) //(!m_iscolliding && flying)
                        {
                            // we're in mid air suspended
                            vec.X += (ctz.X - vel.X) * (PID_D);
@@ -1397,13 +1414,13 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                breakfactor = m_mass;
                vec.X -= breakfactor * vel.X;
                vec.Y -= breakfactor * vel.Y;
-                if (flying)
+                if (m_flying)
                    vec.Z -= 0.5f * breakfactor * vel.Z;
                else
                    vec.Z -= .16f* m_mass * vel.Z;
            }
-            if (flying || hoverPIDActive)
+            if (m_flying || hoverPIDActive)
            {
                vec.Z -= m_parent_scene.gravityz * m_mass;
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs
index 2e6a7db..ce10065 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEDynamics.cs
@@ -345,6 +345,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    if (rootPrim.Body != IntPtr.Zero && !d.BodyIsEnabled(rootPrim.Body)
                            && !rootPrim.m_isSelected && !rootPrim.m_disabled)
                        d.BodyEnable(rootPrim.Body);
                    break;
                case Vehicle.LINEAR_FRICTION_TIMESCALE:
                    if (pValue < m_timestep) pValue = m_timestep;
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
index 4bed0d2..76ef88b 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
@@ -1043,7 +1043,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    d.BodySetLinearVel(Body, 0, 0, 0); // stop it
                    d.BodySetAngularVel(Body, 0, 0, 0);
                }
-                d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
+                if(prim_geom != IntPtr.Zero)
+                    d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
                disableBodySoft(); // stop collisions
                UnSubscribeEvents();
            }
@@ -1240,7 +1241,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    SentEmptyCollisionsEvent = true;
 //                    _parent_scene.RemoveCollisionEventReporting(this);
                }
-                else if(Body == IntPtr.Zero || d.BodyIsEnabled(Body))
+                else if(Body == IntPtr.Zero || (d.BodyIsEnabled(Body) && m_bodydisablecontrol >= 0 ))
                {
                    SentEmptyCollisionsEvent = false;
                    CollisionEventsThisFrame.Clear();
@@ -1847,8 +1848,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    ApplyCollisionCatFlags();
                    _zeroFlag = true;
+                    d.BodySetAutoDisableSteps(Body, m_body_autodisable_frames);
                    d.BodyEnable(Body);
                }
            }
            resetCollisionAccounting();
@@ -2900,6 +2901,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    if (Body != IntPtr.Zero && !m_disabled)
                    {
                        _zeroFlag = true;
+                        d.BodySetAutoDisableSteps(Body, m_body_autodisable_frames);
                        d.BodyEnable(Body);
                    }
                }
@@ -2933,6 +2935,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                        if (!d.BodyIsEnabled(Body))
                        {
                            _zeroFlag = true;
+                            d.BodySetAutoDisableSteps(Body, m_body_autodisable_frames);
                            d.BodyEnable(Body);
                        }
                    }
@@ -2947,6 +2950,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    if (Body != IntPtr.Zero && !d.BodyIsEnabled(Body))
                    {
                        _zeroFlag = true;
+                        d.BodySetAutoDisableSteps(Body, m_body_autodisable_frames);
                        d.BodyEnable(Body);
                    }
                }
@@ -3012,6 +3016,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    if (Body != IntPtr.Zero && !d.BodyIsEnabled(Body))
                    {
                        _zeroFlag = true;
+                        d.BodySetAutoDisableSteps(Body, m_body_autodisable_frames);
                        d.BodyEnable(Body);
                    }
                }
@@ -3070,6 +3075,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    if (Body != IntPtr.Zero && !d.BodyIsEnabled(Body))
                    {
                        _zeroFlag = true;
+                        d.BodySetAutoDisableSteps(Body, m_body_autodisable_frames);
                        d.BodyEnable(Body);
                    }
                }
@@ -3312,8 +3318,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    if (m_disabled)
                        enableBodySoft();
                    else if (!d.BodyIsEnabled(Body))
+                    {
+                        d.BodySetAutoDisableSteps(Body, m_body_autodisable_frames);
                        d.BodyEnable(Body);
+                    }
                }
                m_torque = newtorque;
            }
@@ -3323,7 +3331,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        {
            m_force = force;
            if (!m_isSelected && !m_outbounds && Body != IntPtr.Zero && !d.BodyIsEnabled(Body))
+            {
+                d.BodySetAutoDisableSteps(Body, m_body_autodisable_frames);
                d.BodyEnable(Body);
+            }
        }
        private void changeAddForce(Vector3 theforce)
@@ -3339,7 +3350,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                        if (m_disabled)
                            enableBodySoft();
                        else if (!d.BodyIsEnabled(Body))
+                        {
+                            d.BodySetAutoDisableSteps(Body, m_body_autodisable_frames);
                            d.BodyEnable(Body);
+                        }
                    }
                }
                m_collisionscore = 0;
@@ -3359,7 +3373,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                        if (m_disabled)
                            enableBodySoft();
                        else if (!d.BodyIsEnabled(Body))
+                        {
+                            d.BodySetAutoDisableSteps(Body, m_body_autodisable_frames);
                            d.BodyEnable(Body);
+                        }                            
                    }
                }
                m_collisionscore = 0;
@@ -3382,7 +3399,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    if (m_disabled)
                        enableBodySoft();
                    else if (!d.BodyIsEnabled(Body))
+                    {
+                        d.BodySetAutoDisableSteps(Body, m_body_autodisable_frames);
                        d.BodyEnable(Body);
+                    }
                    d.BodySetLinearVel(Body, newVel.X, newVel.Y, newVel.Z);
                }
                //resetCollisionAccounting();
@@ -3406,7 +3426,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    if (m_disabled)
                        enableBodySoft();
                    else if (!d.BodyIsEnabled(Body))
+                    {
+                        d.BodySetAutoDisableSteps(Body, m_body_autodisable_frames);
                        d.BodyEnable(Body);
+                    }
                    d.BodySetAngularVel(Body, newAngVel.X, newAngVel.Y, newAngVel.Z);
                }
                //resetCollisionAccounting();
@@ -3571,12 +3594,13 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    d.BodySetAngularVel(Body,0f,0f,0f);
                    d.BodySetLinearVel(Body,0f,0f,0f);
                    _zeroFlag = true;
+                    d.BodySetAutoDisableSteps(Body, 1);
                    d.BodyEnable(Body);
-                    m_bodydisablecontrol = -4;
+                    m_bodydisablecontrol = -3;
                }
                if(m_bodydisablecontrol < 0)
-                    m_bodydisablecontrol ++;
+                    m_bodydisablecontrol++;
                d.Vector3 lpos = d.GeomGetPosition(prim_geom); // root position that is seem by rest of simulator
@@ -3741,13 +3765,12 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        public void UpdatePositionAndVelocity(int frame)
        {
-            if (_parent == null && !m_disabled && !m_building && !m_outbounds && Body != IntPtr.Zero)
+            if (_parent == null && !m_isSelected && !m_disabled && !m_building && !m_outbounds && Body != IntPtr.Zero)
            {
-                bool bodyenabled = d.BodyIsEnabled(Body);
                if(m_bodydisablecontrol < 0)
                    return;
+                bool bodyenabled = d.BodyIsEnabled(Body);
                if (bodyenabled || !_zeroFlag)
                {
                    bool lastZeroFlag = _zeroFlag;
@@ -3891,7 +3914,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                         // disable interpolators
                        _velocity = Vector3.Zero;
                        m_acceleration = Vector3.Zero;
-                         m_rotationalVelocity = Vector3.Zero;
+                        m_rotationalVelocity = Vector3.Zero;
                    }
                    else
                    {
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
index 86d41ea..004ee7f 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
@@ -203,8 +203,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        private float metersInSpace = 25.6f;
        private float m_timeDilation = 1.0f;
-        private DateTime m_lastframe;
+        private double m_lastframe;
-        private DateTime m_lastMeshExpire;
+        private double m_lastMeshExpire;
        public float gravityx = 0f;
        public float gravityy = 0f;
@@ -481,7 +481,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    contactsPerCollision = physicsconfig.GetInt("contacts_per_collision", contactsPerCollision);
                    geomDefaultDensity = physicsconfig.GetFloat("geometry_default_density", geomDefaultDensity);
-                    bodyFramesAutoDisable = physicsconfig.GetInt("body_frames_auto_disable", bodyFramesAutoDisable);
+//                    bodyFramesAutoDisable = physicsconfig.GetInt("body_frames_auto_disable", bodyFramesAutoDisable);
                    physics_logging = physicsconfig.GetBoolean("physics_logging", false);
                    physics_logging_interval = physicsconfig.GetInt("physics_logging_interval", 0);
@@ -629,8 +629,9 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                staticPrimspaceOffRegion[i] = newspace;
            }
-            m_lastframe = DateTime.UtcNow;
+            m_lastframe = Util.GetTimeStamp();
            m_lastMeshExpire = m_lastframe;
+            step_time = -1;
        }
        internal void waitForSpaceUnlock(IntPtr space)
@@ -952,8 +953,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
            SharedTmpcontact.surface.bounce = bounce;
            d.ContactGeom altContact = new d.ContactGeom();
-            bool useAltcontact = false;
+            bool useAltcontact;
-            bool noskip = true;
+            bool noskip;
            if(dop1ava || dop2ava)
                smoothMesh = false;
@@ -1000,7 +1001,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                        Joint = CreateContacJoint(ref altContact,smoothMesh);
                    else
                        Joint = CreateContacJoint(ref curContact,smoothMesh);
                    if (Joint == IntPtr.Zero)
                        break;
@@ -1626,6 +1626,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                }
                m_log.InfoFormat("[ubOde] {0} prim actors loaded",_prims.Count);
            }
+            m_lastframe = Util.GetTimeStamp() + 0.5;
+            step_time = -0.5f;
        }
        /// <summary>
@@ -1639,13 +1641,12 @@ namespace OpenSim.Region.PhysicsModule.ubOde
        /// <returns></returns>
        public override float Simulate(float reqTimeStep)
        {
-            DateTime now = DateTime.UtcNow;
+            double now = Util.GetTimeStamp();
-            TimeSpan timedif = now - m_lastframe;
+            double timeStep = now - m_lastframe;
-            float timeStep = (float)timedif.TotalSeconds;
            m_lastframe = now;
            // acumulate time so we can reduce error
-            step_time += timeStep;
+            step_time += (float)timeStep;
            if (step_time < HalfOdeStep)
                return 0;
@@ -1854,14 +1855,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    }
                }
-                timedif = now - m_lastMeshExpire;
-                if (timedif.Seconds > 10)
-                {
-                    mesher.ExpireReleaseMeshs();
-                    m_lastMeshExpire = now;
-                }
 // information block for in debug breakpoint only
 /*
                int ntopactivegeoms = d.SpaceGetNumGeoms(ActiveSpace);
@@ -1941,7 +1934,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    // if we lag too much skip frames
                    m_timeDilation = 0.0f;
                    step_time = 0;
-                    m_lastframe = DateTime.UtcNow; // skip also the time lost
+                    m_lastframe = Util.GetTimeStamp(); // skip also the time lost
                }
                else
                {
@@ -1949,6 +1942,14 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                    if (m_timeDilation > 1)
                        m_timeDilation = 1;
                }
+                if (m_timeDilation == 1 && now - m_lastMeshExpire > 30)
+                {
+                    mesher.ExpireReleaseMeshs();
+                    m_lastMeshExpire = now;
+                }
            }
            return fps;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index af88e4f..c13e8b2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3534,32 +3534,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void doObjectRez(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param, bool atRoot)
        {
            m_host.AddScriptLPS(1);
+            if (Double.IsNaN(rot.x) || Double.IsNaN(rot.y) || Double.IsNaN(rot.z) || Double.IsNaN(rot.s))
+                return;
-            Util.FireAndForget(x =>
+            float dist = (float)llVecDist(llGetPos(), pos);
-            {
-                if (Double.IsNaN(rot.x) || Double.IsNaN(rot.y) || Double.IsNaN(rot.z) || Double.IsNaN(rot.s))
-                    return;
-                float dist = (float)llVecDist(llGetPos(), pos);
+            if (dist > m_ScriptDistanceFactor * 10.0f)
+                return;
-                if (dist > m_ScriptDistanceFactor * 10.0f)
+            TaskInventoryItem item = m_host.Inventory.GetInventoryItem(inventory);
-                    return;
-                TaskInventoryItem item = m_host.Inventory.GetInventoryItem(inventory);
+            if (item == null)
+            {
+               Error("llRez(AtRoot/Object)", "Can't find object '" + inventory + "'");
+               return;
+            }
-                if (item == null)
+            if (item.InvType != (int)InventoryType.Object)
-                {
+            {
-                    Error("llRez(AtRoot/Object)", "Can't find object '" + inventory + "'");
+               Error("llRez(AtRoot/Object)", "Can't create requested object; object is missing from database");
-                    return;
+               return;
-                }
+            }
-                if (item.InvType != (int)InventoryType.Object)
+            Util.FireAndForget(x =>
-                {
+            {
-                    Error("llRez(AtRoot/Object)", "Can't create requested object; object is missing from database");
-                    return;
-                }
-                List<SceneObjectGroup> new_groups = World.RezObject(m_host, item, pos, rot, vel, param, atRoot);
+                Quaternion wrot = rot;
+                wrot.Normalize();
+                List<SceneObjectGroup> new_groups = World.RezObject(m_host, item, pos, wrot, vel, param, atRoot);
                // If either of these are null, then there was an unknown error.
                if (new_groups == null)
@@ -3596,9 +3598,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                            }
                        }
                    }
-                    // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)
+                 }
-                }
            }, null, "LSL_Api.doObjectRez");
            //ScriptSleep((int)((groupmass * velmag) / 10));
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index e51a078..79367fb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -264,6 +264,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        // for safe funtions always active 
        public void CheckThreatLevel()
        {
+            m_host.AddScriptLPS(1);
            if (!m_OSFunctionsEnabled)
                OSSLError(String.Format("{0} permission denied.  All OS functions are disabled.")); // throws
        }
@@ -271,6 +272,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        // Returns if the function is allowed. Throws a script exception if not allowed.
        public void CheckThreatLevel(ThreatLevel level, string function)
        {
+            m_host.AddScriptLPS(1);
            if (!m_OSFunctionsEnabled)
                OSSLError(String.Format("{0} permission denied.  All OS functions are disabled.", function)); // throws
@@ -452,7 +454,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                        }
                    }
                    if (!m_FunctionPerms[function].AllowedCreators.Contains(m_item.CreatorID))
                        return(
                            String.Format("{0} permission denied. Script creator is not in the list of users allowed to execute this function and prim owner also has no permission.",
@@ -499,8 +500,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        private LSL_Integer SetTerrainHeight(int x, int y, double val)
        {
-            m_host.AddScriptLPS(1);
            if (x > (World.RegionInfo.RegionSizeX - 1) || x < 0 || y > (World.RegionInfo.RegionSizeY - 1) || y < 0)
                OSSLError("osSetTerrainHeight: Coordinate out of bounds");
@@ -517,20 +516,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Float osGetTerrainHeight(int x, int y)
        {
-            CheckThreatLevel(ThreatLevel.None, "osGetTerrainHeight");
+            CheckThreatLevel();
            return GetTerrainHeight(x, y);
        }
        public LSL_Float osTerrainGetHeight(int x, int y)
        {
-            CheckThreatLevel(ThreatLevel.None, "osTerrainGetHeight");
+            CheckThreatLevel();
            OSSLDeprecated("osTerrainGetHeight", "osGetTerrainHeight");
            return GetTerrainHeight(x, y);
        }
        private LSL_Float GetTerrainHeight(int x, int y)
        {
-            m_host.AddScriptLPS(1);
            if (x > (World.RegionInfo.RegionSizeX - 1) || x < 0 || y > (World.RegionInfo.RegionSizeY - 1) || y < 0)
                OSSLError("osGetTerrainHeight: Coordinate out of bounds");
@@ -540,7 +538,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osTerrainFlush()
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osTerrainFlush");
-            m_host.AddScriptLPS(1);
            ITerrainModule terrainModule = World.RequestModuleInterface<ITerrainModule>();
            if (terrainModule != null) terrainModule.TaintTerrain();
@@ -557,7 +554,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            CheckThreatLevel(ThreatLevel.High, "osRegionRestart");
            IRestartModule restartModule = World.RequestModuleInterface<IRestartModule>();
-            m_host.AddScriptLPS(1);
            if (World.Permissions.CanIssueEstateCommand(m_host.OwnerID, false) && (restartModule != null))
            {
                if (seconds < 15)
@@ -580,7 +576,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            CheckThreatLevel(ThreatLevel.High, "osRegionRestart");
            IRestartModule restartModule = World.RequestModuleInterface<IRestartModule>();
-            m_host.AddScriptLPS(1);
            if (World.Permissions.CanIssueEstateCommand(m_host.OwnerID, false) && (restartModule != null))
            {
                if (seconds < 15)
@@ -631,8 +626,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            //
            CheckThreatLevel(ThreatLevel.VeryHigh, "osRegionNotice");
-            m_host.AddScriptLPS(1);
            IDialogModule dm = World.RequestModuleInterface<IDialogModule>();
            if (dm != null)
@@ -646,7 +639,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            //
            CheckThreatLevel(ThreatLevel.VeryHigh, "osSetRot");
-            m_host.AddScriptLPS(1);
            if (World.Entities.ContainsKey(target))
            {
                EntityBase entity;
@@ -672,13 +664,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            //
            CheckThreatLevel(ThreatLevel.VeryLow, "osSetDynamicTextureURL");
-            m_host.AddScriptLPS(1);
            if (dynamicID == String.Empty)
            {
                IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
                UUID createdTexture =
                    textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
-                                                        extraParams, timer);
+                                                        extraParams);
                return createdTexture.ToString();
            }
            else
@@ -694,13 +685,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osSetDynamicTextureURLBlend");
-            m_host.AddScriptLPS(1);
            if (dynamicID == String.Empty)
            {
                IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
                UUID createdTexture =
                    textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
-                                                        extraParams, timer, true, (byte) alpha);
+                                                        extraParams, true, (byte) alpha);
                return createdTexture.ToString();
            }
            else
@@ -716,13 +706,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osSetDynamicTextureURLBlendFace");
-            m_host.AddScriptLPS(1);
            if (dynamicID == String.Empty)
            {
                IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
                UUID createdTexture =
                    textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
-                                                        extraParams, timer, blend, disp, (byte) alpha, face);
+                                                        extraParams, blend, disp, (byte) alpha, face);
                return createdTexture.ToString();
            }
            else
@@ -736,9 +725,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams,
                                           int timer)
        {
+            return osSetDynamicTextureDataFace(dynamicID, contentType, data, extraParams, timer, -1);
+        }
+        public string osSetDynamicTextureDataFace(string dynamicID, string contentType, string data, string extraParams,
+                                           int timer, int face)
+        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osSetDynamicTextureData");
-            m_host.AddScriptLPS(1);
            if (dynamicID == String.Empty)
            {
                IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
@@ -750,7 +744,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    }
                    UUID createdTexture =
                        textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
-                                                            extraParams, timer);
+                                                            extraParams, false, 3, 255, face);
                    return createdTexture.ToString();
                }
            }
@@ -767,7 +762,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osSetDynamicTextureDataBlend");
-            m_host.AddScriptLPS(1);
            if (dynamicID == String.Empty)
            {
                IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
@@ -779,7 +773,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    }
                    UUID createdTexture =
                        textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
-                                                            extraParams, timer, true, (byte) alpha);
+                                                            extraParams, true, (byte) alpha);
                    return createdTexture.ToString();
                }
            }
@@ -794,9 +788,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams,
                                          bool blend, int disp, int timer, int alpha, int face)
        {
-            CheckThreatLevel(ThreatLevel.VeryLow, "osSetDynamicTextureDataBlendFace");
+            CheckThreatLevel(ThreatLevel.VeryLow , "osSetDynamicTextureDataBlendFace");
-            m_host.AddScriptLPS(1);
            if (dynamicID == String.Empty)
            {
                IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
@@ -808,7 +801,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    }
                    UUID createdTexture =
                        textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
-                                                            extraParams, timer, blend, disp, (byte) alpha, face);
+                                                            extraParams, blend, disp, (byte) alpha, face);
                    return createdTexture.ToString();
                }
            }
@@ -824,8 +817,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.Severe, "osConsoleCommand");
-            m_host.AddScriptLPS(1);
            // For safety, we add another permission check here, and don't rely only on the standard OSSL permissions
            if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
            {
@@ -840,11 +831,50 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osSetPrimFloatOnWater");
-            m_host.AddScriptLPS(1);
            m_host.ParentGroup.RootPart.SetFloatOnWater(floatYN);
        }
+        private bool checkAllowAgentTPbyLandOwner(UUID agentId, Vector3 pos)
+        {
+            UUID hostOwner = m_host.OwnerID;
+            if(hostOwner == agentId)
+                return true;
+            if (m_item.PermsGranter == agentId)
+            {
+                if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TELEPORT) != 0)
+                    return true;
+            }
+            ILandObject land = World.LandChannel.GetLandObject(pos);
+            if(land == null)
+                return true;
+            LandData landdata = land.LandData;
+            if(landdata == null)
+                return true;
+            if(landdata.OwnerID == hostOwner)
+                return true;
+            EstateSettings es = World.RegionInfo.EstateSettings;
+            if(es != null && es.IsEstateManagerOrOwner(hostOwner))
+                return true;
+            if(!landdata.IsGroupOwned)
+                return false;
+            UUID landGroup = landdata.GroupID;
+            if(landGroup == UUID.Zero)
+                return false;
+            if(landGroup == m_host.GroupID)
+                return true;
+            return false;
+        }
        // Teleport functions
        public void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
        {
@@ -852,41 +882,46 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            //
            CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent");
-            TeleportAgent(agent, regionName, position, lookat, false);
+            TeleportAgent(agent, regionName, position, lookat);
        }
        private void TeleportAgent(string agent, string regionName,
-            LSL_Types.Vector3 position, LSL_Types.Vector3 lookat, bool relaxRestrictions)
+            LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
        {
-            m_host.AddScriptLPS(1);
+            if(String.IsNullOrEmpty(regionName))
-            UUID agentId = new UUID();
+                regionName = World.RegionInfo.RegionName;
+            UUID agentId;
            if (UUID.TryParse(agent, out agentId))
            {
                ScenePresence presence = World.GetScenePresence(agentId);
-                if (presence != null)
+                if (presence == null || presence.IsDeleted || presence.IsInTransit)
-                {
+                    return;
-                    // For osTeleportAgent, agent must be over owners land to avoid abuse
-                    // For osTeleportOwner, this restriction isn't necessary
-                    // commented out because its redundant and uneeded please remove eventually.
-                    // if (relaxRestrictions ||
-                    //    m_host.OwnerID
-                    //    == World.LandChannel.GetLandObject(
-                    //        presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
-                    // {
-                        // 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(
-                            o => World.RequestTeleportLocation(
-                                presence.ControllingClient, regionName, position,
-                                lookat, (uint)TPFlags.ViaLocation),
-                            null, "OSSL_Api.TeleportAgentByRegionCoords");
-                        ScriptSleep(5000);
-                    // }
+                Vector3 pos = presence.AbsolutePosition;
+                if(!checkAllowAgentTPbyLandOwner(agentId, pos))
+                {
+                    ScriptSleep(500);
+                    return;
+                }
+                if(regionName == World.RegionInfo.RegionName)
+                {
+                    // should be faster than going to threadpool
+                    World.RequestTeleportLocation(presence.ControllingClient, regionName, position,
+                        lookat, (uint)TPFlags.ViaLocation);
+                    ScriptSleep(500);
+                }
+                else
+                {
+                // 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(
+                    o => World.RequestTeleportLocation(
+                        presence.ControllingClient, regionName, position,
+                        lookat, (uint)TPFlags.ViaLocation),
+                    null, "OSSL_Api.TeleportAgentByRegionCoords");
+                ScriptSleep(5000);
                }
            }
        }
@@ -897,50 +932,58 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            //
            CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent");
-            TeleportAgent(agent, regionGridX, regionGridY, position, lookat, false);
+            TeleportAgent(agent, regionGridX, regionGridY, position, lookat);
        }
        private void TeleportAgent(string agent, int regionGridX, int regionGridY,
-            LSL_Types.Vector3 position, LSL_Types.Vector3 lookat, bool relaxRestrictions)
+            LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
        {
            ulong regionHandle = Util.RegionGridLocToHandle((uint)regionGridX, (uint)regionGridY);
-            m_host.AddScriptLPS(1);
+            UUID agentId;
-            UUID agentId = new UUID();
            if (UUID.TryParse(agent, out agentId))
            {
                ScenePresence presence = World.GetScenePresence(agentId);
-                if (presence != null)
+                if (presence == null || presence.IsDeleted || presence.IsInTransit)
-                {
+                    return;
-                    // For osTeleportAgent, agent must be over owners land to avoid abuse
-                    // For osTeleportOwner, this restriction isn't necessary
-                    // commented out because its redundant and uneeded please remove eventually.
-                    // if (relaxRestrictions ||
-                    //    m_host.OwnerID
-                    //    == World.LandChannel.GetLandObject(
-                    //        presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
-                    // {
-                        // 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(
-                            o => World.RequestTeleportLocation(
-                                presence.ControllingClient, regionHandle,
-                                position, lookat, (uint)TPFlags.ViaLocation),
-                            null, "OSSL_Api.TeleportAgentByRegionName");
-                        ScriptSleep(5000);
+                Vector3 pos = presence.AbsolutePosition;
+                if(!checkAllowAgentTPbyLandOwner(agentId, pos))
+                {
+                    ScriptSleep(500);
+                    return;
+                }
-                   //  }
+                Util.FireAndForget(
+                    o => World.RequestTeleportLocation(
+                        presence.ControllingClient, regionHandle,
+                        position, lookat, (uint)TPFlags.ViaLocation),
+                    null, "OSSL_Api.TeleportAgentByRegionName");
-                }
+                ScriptSleep(5000);
            }
        }
        public void osTeleportAgent(string agent, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
        {
-            osTeleportAgent(agent, World.RegionInfo.RegionName, position, lookat);
+            UUID agentId;
+            if (UUID.TryParse(agent, out agentId))
+            {
+                ScenePresence presence = World.GetScenePresence(agentId);
+                if (presence == null || presence.IsDeleted || presence.IsInTransit)
+                    return;
+                Vector3 pos = presence.AbsolutePosition;
+                if(!checkAllowAgentTPbyLandOwner(agentId, pos))
+                {
+                    ScriptSleep(500);
+                    return;
+                }
+                World.RequestTeleportLocation(presence.ControllingClient, World.RegionInfo.RegionName, position,
+                    lookat, (uint)TPFlags.ViaLocation);
+                ScriptSleep(500);
+            }
        }
        public void osTeleportOwner(string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
@@ -948,19 +991,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            // Threat level None because this is what can already be done with the World Map in the viewer
            CheckThreatLevel(ThreatLevel.None, "osTeleportOwner");
-            TeleportAgent(m_host.OwnerID.ToString(), regionName, position, lookat, true);
+            TeleportAgent(m_host.OwnerID.ToString(), regionName, position, lookat);
        }
-        public void osTeleportOwner(LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
+        public void osTeleportOwner(int regionGridX, int regionGridY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
        {
-            osTeleportOwner(World.RegionInfo.RegionName, position, lookat);
+            CheckThreatLevel(ThreatLevel.None, "osTeleportOwner");
+            TeleportAgent(m_host.OwnerID.ToString(), regionGridX, regionGridY, position, lookat);
        }
-        public void osTeleportOwner(int regionGridX, int regionGridY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
+        public void osTeleportOwner(LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
        {
            CheckThreatLevel(ThreatLevel.None, "osTeleportOwner");
-            TeleportAgent(m_host.OwnerID.ToString(), regionGridX, regionGridY, position, lookat, true);
+            osTeleportAgent(m_host.OwnerID.ToString(), position, lookat);
        }
        ///<summary>
@@ -974,8 +1019,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.VeryHigh, "osForceOtherSit");
-            m_host.AddScriptLPS(1);
            ForceSit(avatar, m_host.UUID);
        }
@@ -989,8 +1032,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.VeryHigh, "osForceOtherSit");
-            m_host.AddScriptLPS(1);
            UUID targetID = new UUID(target);
            ForceSit(avatar, targetID);
@@ -1015,21 +1056,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    targetID,
                    part.SitTargetPosition);
        }
+ 
+        // Get a list of all the avatars/agents in the region
+        public LSL_List osGetAgents()
+        {
+            // threat level is None as we could get this information with an
+            // in-world script as well, just not as efficient
+            CheckThreatLevel(ThreatLevel.None, "osGetAgents");
+            LSL_List result = new LSL_List();
+            World.ForEachRootScenePresence(delegate(ScenePresence sp)
+            {
+                result.Add(new LSL_String(sp.Name));
+            });
+            return result;
+        }
-        // Functions that get information from the agent itself.
-        //
-        // osGetAgentIP - this is used to determine the IP address of
-        //the client.  This is needed to help configure other in world
-        //resources based on the IP address of the clients connected.
-        //I think High is a good risk level for this, as it is an
-        //information leak.
        public string osGetAgentIP(string agent)
        {
-            CheckThreatLevel(ThreatLevel.High, "osGetAgentIP");
+            CheckThreatLevel(ThreatLevel.Severe, "osGetAgentIP"); 
+            if(!(World.Permissions.IsGod(m_host.OwnerID))) // user god always needed
+                return "";
            UUID avatarID = (UUID)agent;
-            m_host.AddScriptLPS(1);
            if (World.Entities.ContainsKey((UUID)agent) && World.Entities[avatarID] is ScenePresence)
            {
                ScenePresence target = (ScenePresence)World.Entities[avatarID];
@@ -1040,22 +1090,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            return "";
        }
-        // Get a list of all the avatars/agents in the region
-        public LSL_List osGetAgents()
-        {
-            // threat level is None as we could get this information with an
-            // in-world script as well, just not as efficient
-            CheckThreatLevel(ThreatLevel.None, "osGetAgents");
-            m_host.AddScriptLPS(1);
-            LSL_List result = new LSL_List();
-            World.ForEachRootScenePresence(delegate(ScenePresence sp)
-            {
-                result.Add(new LSL_String(sp.Name));
-            });
-            return result;
-        }
        // Adam's super super custom animation functions
        public void osAvatarPlayAnimation(string avatar, string animation)
        {
@@ -1066,19 +1100,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        private void AvatarPlayAnimation(string avatar, string animation)
        {
-            m_host.AddScriptLPS(1);
            UUID avatarID;
            if(!UUID.TryParse(avatar, out avatarID))
                return;
-            if(!World.Entities.ContainsKey(avatarID))
+            ScenePresence target = World.GetScenePresence(avatarID);
-                return;
-            ScenePresence target = null;
-            if ((World.Entities[avatarID] is ScenePresence))
-                target = (ScenePresence)World.Entities[avatarID];
            if (target == null)
                return;
@@ -1114,8 +1140,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            UUID avatarID = (UUID)avatar;
-            m_host.AddScriptLPS(1);
            // FIXME: What we really want to do here is factor out the similar code in llStopAnimation() to a common
            // method (though see that doesn't do the is animation check, which is probably a bug) and have both
            // these functions call that common code.  However, this does mean navigating the brain-dead requirement
@@ -1146,29 +1170,59 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        }
        //Texture draw functions
+        public string osDrawResetTransform(string drawList)
+        {
+            CheckThreatLevel();
+            drawList += "ResetTransf;";
+            return drawList;
+        }
+        public string osDrawRotationTransform(string drawList, LSL_Float x)
+        {
+            CheckThreatLevel();
+            drawList += "RotTransf " + x + ";";
+            return drawList;
+        }
+        public string osDrawScaleTransform(string drawList, LSL_Float x, LSL_Float y)
+        {
+            CheckThreatLevel();
+            drawList += "ScaleTransf " + x + "," + y + ";";
+            return drawList;
+        }
+        public string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y)
+        {
+            CheckThreatLevel();
+            drawList += "TransTransf " + x + "," + y + ";";
+            return drawList;
+        }
        public string osMovePen(string drawList, int x, int y)
        {
-            CheckThreatLevel(ThreatLevel.None, "osMovePen");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            drawList += "MoveTo " + x + "," + y + ";";
            return drawList;
        }
        public string osDrawLine(string drawList, int startX, int startY, int endX, int endY)
        {
-            CheckThreatLevel(ThreatLevel.None, "osDrawLine");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            drawList += "MoveTo "+ startX+","+ startY +"; LineTo "+endX +","+endY +"; ";
            return drawList;
        }
        public string osDrawLine(string drawList, int endX, int endY)
        {
-            CheckThreatLevel(ThreatLevel.None, "osDrawLine");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            drawList += "LineTo " + endX + "," + endY + "; ";
            return drawList;
        }
@@ -1177,43 +1231,45 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.None, "osDrawText");
-            m_host.AddScriptLPS(1);
            drawList += "Text " + text + "; ";
            return drawList;
        }
        public string osDrawEllipse(string drawList, int width, int height)
        {
-            CheckThreatLevel(ThreatLevel.None, "osDrawEllipse");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            drawList += "Ellipse " + width + "," + height + "; ";
            return drawList;
        }
+        public string osDrawFilledEllipse(string drawList, int width, int height)
+        {
+            CheckThreatLevel();
+            drawList += "FillEllipse " + width + "," + height + "; ";
+            return drawList;
+        }
        public string osDrawRectangle(string drawList, int width, int height)
        {
-            CheckThreatLevel(ThreatLevel.None, "osDrawRectangle");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            drawList += "Rectangle " + width + "," + height + "; ";
            return drawList;
        }
        public string osDrawFilledRectangle(string drawList, int width, int height)
        {
-            CheckThreatLevel(ThreatLevel.None, "osDrawFilledRectangle");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            drawList += "FillRectangle " + width + "," + height + "; ";
            return drawList;
        }
        public string osDrawFilledPolygon(string drawList, LSL_List x, LSL_List y)
        {
-            CheckThreatLevel(ThreatLevel.None, "osDrawFilledPolygon");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            if (x.Length != y.Length || x.Length < 3)
            {
@@ -1230,9 +1286,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osDrawPolygon(string drawList, LSL_List x, LSL_List y)
        {
-            CheckThreatLevel(ThreatLevel.None, "osDrawPolygon");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            if (x.Length != y.Length || x.Length < 3)
            {
@@ -1249,36 +1303,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osSetFontSize(string drawList, int fontSize)
        {
-            CheckThreatLevel(ThreatLevel.None, "osSetFontSize");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            drawList += "FontSize "+ fontSize +"; ";
            return drawList;
        }
        public string osSetFontName(string drawList, string fontName)
        {
-            CheckThreatLevel(ThreatLevel.None, "osSetFontName");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            drawList += "FontName "+ fontName +"; ";
            return drawList;
        }
        public string osSetPenSize(string drawList, int penSize)
        {
-            CheckThreatLevel(ThreatLevel.None, "osSetPenSize");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            drawList += "PenSize " + penSize + "; ";
            return drawList;
        }
        public string osSetPenColor(string drawList, string color)
        {
-            CheckThreatLevel(ThreatLevel.None, "osSetPenColor");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            drawList += "PenColor " + color + "; ";
            return drawList;
        }
@@ -1286,36 +1336,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        // Deprecated
        public string osSetPenColour(string drawList, string colour)
        {
-            CheckThreatLevel(ThreatLevel.None, "osSetPenColour");
+            CheckThreatLevel();
            OSSLDeprecated("osSetPenColour", "osSetPenColor");
-            m_host.AddScriptLPS(1);
            drawList += "PenColour " + colour + "; ";
            return drawList;
        }
        public string osSetPenCap(string drawList, string direction, string type)
        {
-            CheckThreatLevel(ThreatLevel.None, "osSetPenCap");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            drawList += "PenCap " + direction + "," + type + "; ";
            return drawList;
        }
        public string osDrawImage(string drawList, int width, int height, string imageUrl)
        {
-            CheckThreatLevel(ThreatLevel.None, "osDrawImage");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            drawList +="Image " +width + "," + height+ ","+ imageUrl +"; " ;
            return drawList;
        }
        public LSL_Vector osGetDrawStringSize(string contentType, string text, string fontName, int fontSize)
        {
-            CheckThreatLevel(ThreatLevel.VeryLow, "osGetDrawStringSize");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            LSL_Vector vec = new LSL_Vector(0,0,0);
            IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
@@ -1338,7 +1384,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            // should be removed
            //
            CheckThreatLevel(ThreatLevel.High, "osSetStateEvents");
-            m_host.AddScriptLPS(1);
            m_host.SetScriptEvents(m_item.ItemID, events);
        }
@@ -1347,8 +1392,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.High, "osSetRegionWaterHeight");
-            m_host.AddScriptLPS(1);
            World.EventManager.TriggerRequestChangeWaterHeight((float)height);
        }
@@ -1362,8 +1405,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.High, "osSetRegionSunSettings");
-            m_host.AddScriptLPS(1);
            while (sunHour > 24.0)
                sunHour -= 24.0;
@@ -1387,8 +1428,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.High, "osSetEstateSunSettings");
-            m_host.AddScriptLPS(1);
            while (sunHour > 24.0)
                sunHour -= 24.0;
@@ -1409,9 +1448,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public double osGetCurrentSunHour()
        {
-            CheckThreatLevel(ThreatLevel.None, "osGetCurrentSunHour");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            // Must adjust for the fact that Region Sun Settings are still LL offset
            double sunHour = World.RegionInfo.RegionSettings.SunPosition - 6;
@@ -1435,14 +1472,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public double osGetSunParam(string param)
        {
-            CheckThreatLevel(ThreatLevel.None, "osGetSunParam");
+            CheckThreatLevel();
            return GetSunParam(param);
        }
        private double GetSunParam(string param)
        {
-            m_host.AddScriptLPS(1);
            double value = 0.0;
            ISunModule module = World.RequestModuleInterface<ISunModule>();
@@ -1469,8 +1504,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        private void SetSunParam(string param, double value)
        {
-            m_host.AddScriptLPS(1);
            ISunModule module = World.RequestModuleInterface<ISunModule>();
            if (module != null)
            {
@@ -1481,7 +1514,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osWindActiveModelPluginName()
        {
            CheckThreatLevel(ThreatLevel.None, "osWindActiveModelPluginName");
-            m_host.AddScriptLPS(1);
            IWindModule module = World.RequestModuleInterface<IWindModule>();
            if (module != null)
@@ -1495,7 +1527,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osSetWindParam(string plugin, string param, LSL_Float value)
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osSetWindParam");
-            m_host.AddScriptLPS(1);
            IWindModule module = World.RequestModuleInterface<IWindModule>();
            if (module != null)
@@ -1511,7 +1542,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Float osGetWindParam(string plugin, string param)
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osGetWindParam");
-            m_host.AddScriptLPS(1);
            IWindModule module = World.RequestModuleInterface<IWindModule>();
            if (module != null)
@@ -1526,7 +1556,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osParcelJoin(LSL_Vector pos1, LSL_Vector pos2)
        {
            CheckThreatLevel(ThreatLevel.High, "osParcelJoin");
-            m_host.AddScriptLPS(1);
            int startx = (int)(pos1.x < pos2.x ? pos1.x : pos2.x);
            int starty = (int)(pos1.y < pos2.y ? pos1.y : pos2.y);
@@ -1539,7 +1568,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osParcelSubdivide(LSL_Vector pos1, LSL_Vector pos2)
        {
            CheckThreatLevel(ThreatLevel.High, "osParcelSubdivide");
-            m_host.AddScriptLPS(1);
            int startx = (int)(pos1.x < pos2.x ? pos1.x : pos2.x);
            int starty = (int)(pos1.y < pos2.y ? pos1.y : pos2.y);
@@ -1566,8 +1594,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        private void SetParcelDetails(LSL_Vector pos, LSL_List rules, string functionName)
        {
-            m_host.AddScriptLPS(1);
            // Get a reference to the land data and make sure the owner of the script
            // can modify it
@@ -1580,13 +1606,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            if (!World.Permissions.CanEditParcelProperties(m_host.OwnerID, startLandObject, GroupPowers.LandOptions, false))
            {
-                OSSLShoutError("You do not have permission to modify the parcel");
+                OSSLShoutError("script owner does not have permission to modify the parcel");
                return;
            }
            // Create a new land data object we can modify
            LandData newLand = startLandObject.LandData.Copy();
            UUID uuid;
+            EstateSettings es = World.RegionInfo.EstateSettings;
+            bool changed = false;
+            bool changedSeeAvs = false;
+            bool changedoverlay = false;
+            bool changedneedupdate = false;
            // Process the rules, not sure what the impact would be of changing owner or group
            for (int idx = 0; idx < rules.Length;)
@@ -1596,35 +1628,151 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                switch (code)
                {
                    case ScriptBaseClass.PARCEL_DETAILS_NAME:
-                        newLand.Name = arg;
+                        if(newLand.Name != arg)
+                        {
+                            newLand.Name = arg;
+                            changed = true;
+                        }
                        break;
                    case ScriptBaseClass.PARCEL_DETAILS_DESC:
-                        newLand.Description = arg;
+                        if(newLand.Description != arg)
+                        {
+                            newLand.Description = arg;
+                            changed = true;
+                        }
                        break;
                    case ScriptBaseClass.PARCEL_DETAILS_OWNER:
-                        CheckThreatLevel(ThreatLevel.VeryHigh, functionName);
+                        if(es != null && !es.IsEstateManagerOrOwner(m_host.OwnerID))
-                        if (UUID.TryParse(arg, out uuid))
+                        {
-                            newLand.OwnerID = uuid;
+                            OSSLError("script owner does not have permission to modify the parcel owner");
+                        }
+                        else
+                        {
+                            if (UUID.TryParse(arg, out uuid))
+                            {   
+                                if(newLand.OwnerID != uuid)
+                                {
+                                    changed = true;
+                                    newLand.OwnerID = uuid;
+                                    newLand.GroupID = UUID.Zero;
+                                }
+                            }
+                        }
                        break;
                    case ScriptBaseClass.PARCEL_DETAILS_GROUP:
-                        CheckThreatLevel(ThreatLevel.VeryHigh, functionName);
+                        if(m_host.OwnerID == newLand.OwnerID || es == null || es.IsEstateManagerOrOwner(m_host.OwnerID))
-                        if (UUID.TryParse(arg, out uuid))
+                        {
-                            newLand.GroupID = uuid;
+                            if (UUID.TryParse(arg, out uuid))
+                            {
+                                if(newLand.GroupID != uuid)
+                                {
+                                    if(uuid == UUID.Zero)
+                                    {
+                                        changed = true;
+                                        newLand.GroupID = uuid;
+                                    }
+                                    else
+                                    {
+                                        IGroupsModule groupsModule = m_ScriptEngine.World.RequestModuleInterface<IGroupsModule>();
+                                        GroupMembershipData member = null;
+                                        if (groupsModule != null)
+                                            member = groupsModule.GetMembershipData(uuid, newLand.OwnerID);
+                                        if (member == null)
+                                            OSSLError(string.Format("land owner is not member of the new group for parcel"));
+                                        else
+                                        {
+                                            changed = true;
+                                            newLand.GroupID = uuid;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        else
+                        {
+                            OSSLError("script owner does not have permission to modify the parcel group");
+                        }
                        break;
                    case ScriptBaseClass.PARCEL_DETAILS_CLAIMDATE:
-                        CheckThreatLevel(ThreatLevel.VeryHigh, functionName);
+                        if(es != null && !es.IsEstateManagerOrOwner(m_host.OwnerID))
-                        newLand.ClaimDate = Convert.ToInt32(arg);
+                        {
-                        if (newLand.ClaimDate == 0)
+                            OSSLError("script owner does not have permission to modify the parcel CLAIM DATE");
-                            newLand.ClaimDate = Util.UnixTimeSinceEpoch();
+                        }
+                        else
+                        {
+                            int date =  Convert.ToInt32(arg);
+                            if (date == 0)
+                                date = Util.UnixTimeSinceEpoch();
+                            if(newLand.ClaimDate != date)
+                            {
+                                changed = true;
+                                newLand.ClaimDate = date;
+                            }
+                        }
+                        break;
+                    case ScriptBaseClass.PARCEL_DETAILS_SEE_AVATARS:
+                        bool newavs = (Convert.ToInt32(arg) != 0);
+                        if(newLand.SeeAVs != newavs)
+                        {
+                            changed = true;
+                            changedSeeAvs = true;
+                            changedoverlay = true;
+                            changedneedupdate = true;
+                            newLand.SeeAVs = newavs;
+                        }
+                        break;
+                    case ScriptBaseClass.PARCEL_DETAILS_ANY_AVATAR_SOUNDS:
+                        bool newavsounds = (Convert.ToInt32(arg) != 0);
+                        if(newLand.AnyAVSounds != newavsounds)
+                        {
+                            changed = true;
+                            newLand.AnyAVSounds = newavsounds;
+                        }
                        break;
-                 }
-             }
-            World.LandChannel.UpdateLandObject(newLand.LocalID,newLand);
+                    case ScriptBaseClass.PARCEL_DETAILS_GROUP_SOUNDS:
+                        bool newgrpsounds = (Convert.ToInt32(arg) != 0);
+                        if(newLand.GroupAVSounds != newgrpsounds)
+                        {
+                            changed = true;
+                            newLand.GroupAVSounds = newgrpsounds;
+                        }
+                        break;
+                    }
+            }
+            if(changed)
+            {
+                World.LandChannel.UpdateLandObject(newLand.LocalID, newLand);
+                if(changedneedupdate)
+                {
+                    UUID parcelID= newLand.GlobalID;
+                    World.ForEachRootScenePresence(delegate (ScenePresence avatar)
+                    {
+                        if (avatar == null || avatar.IsDeleted || avatar.IsInTransit)
+                            return;
+                        if(changedSeeAvs && avatar.currentParcelUUID == parcelID )
+                            avatar.currentParcelUUID = parcelID; // force parcel flags review
+                        
+                        if(avatar.ControllingClient == null)
+                            return;
+                        // this will be needed for some things like damage etc
+//                        if(avatar.currentParcelUUID == parcelID)
+//                            startLandObject.SendLandUpdateToClient(avatar.ControllingClient);
+                        if(changedoverlay && !avatar.IsNPC)
+                            World.LandChannel.SendParcelsOverlay(avatar.ControllingClient);
+                    });
+                }
+            }
        }
        public double osList2Double(LSL_Types.list src, int index)
@@ -1634,9 +1782,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            // is not allowed to contain any.
            // This really should be removed.
            //
-            CheckThreatLevel(ThreatLevel.None, "osList2Double");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            if (index < 0)
            {
                index = src.Length + index;
@@ -1654,8 +1801,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            //
            CheckThreatLevel(ThreatLevel.VeryLow, "osSetParcelMediaURL");
-            m_host.AddScriptLPS(1);
            ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition);
            if (land.LandData.OwnerID != m_host.OwnerID)
@@ -1670,8 +1815,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            //
            CheckThreatLevel(ThreatLevel.VeryLow, "osSetParcelSIPAddress");
-            m_host.AddScriptLPS(1);
            ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition);
            if (land.LandData.OwnerID != m_host.OwnerID)
@@ -1698,8 +1841,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            //
            CheckThreatLevel(ThreatLevel.High, "osGetScriptEngineName");
-            m_host.AddScriptLPS(1);
            int scriptEngineNameIndex = 0;
            if (!String.IsNullOrEmpty(m_ScriptEngine.ScriptEngineName))
@@ -1725,7 +1866,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Integer osCheckODE()
        {
            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            LSL_Integer ret = 0;    // false
            if (m_ScriptEngine.World.PhysicsScene != null)
@@ -1749,6 +1889,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            //    about the physics engine, this function returns an empty string if
            //    the user does not have permission to see it. This as opposed to
            //    throwing an exception.
            m_host.AddScriptLPS(1);
            string ret = String.Empty;
            if (String.IsNullOrEmpty(CheckThreatLevelTest(ThreatLevel.High, "osGetPhysicsEngineType")))
@@ -1768,7 +1909,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osGetPhysicsEngineName()
        {
            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            string ret = "NoEngine";
            if (m_ScriptEngine.World.PhysicsScene != null)
@@ -1789,7 +1929,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            // kiddie)
            //
            CheckThreatLevel(ThreatLevel.High,"osGetSimulatorVersion");
-            m_host.AddScriptLPS(1);
            return m_ScriptEngine.World.GetSimulatorVersion();
        }
@@ -1835,8 +1974,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.None, "osParseJSONNew");
-            m_host.AddScriptLPS(1);
            try
            {
                OSD decoded = OSDParser.DeserializeJson(JSON);
@@ -1853,8 +1990,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.None, "osParseJSON");
-            m_host.AddScriptLPS(1);
            Object decoded = osParseJSONNew(JSON);
            if ( decoded is Hashtable ) {
@@ -1885,7 +2020,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osMessageObject(LSL_Key objectUUID, string message)
        {
            CheckThreatLevel(ThreatLevel.Low, "osMessageObject");
-            m_host.AddScriptLPS(1);
            UUID objUUID;
            if (!UUID.TryParse(objectUUID, out objUUID)) // prior to patching, a thrown exception regarding invalid GUID format would be shouted instead.
@@ -1926,7 +2060,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            // if this is restricted to objects rezzed by this host level can be reduced
            CheckThreatLevel(ThreatLevel.Low, "osDie");
-            m_host.AddScriptLPS(1);
            UUID objUUID;
            if (!UUID.TryParse(objectUUID, out objUUID))
@@ -1976,7 +2109,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osMakeNotecard(string notecardName, LSL_Types.list contents)
        {
            CheckThreatLevel(ThreatLevel.High, "osMakeNotecard");
-            m_host.AddScriptLPS(1);
            StringBuilder notecardData = new StringBuilder();
@@ -2162,7 +2294,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osGetNotecardLine(string name, int line)
        {
            CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNotecardLine");
-            m_host.AddScriptLPS(1);
            UUID assetID = CacheNotecard(name);
@@ -2190,7 +2321,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osGetNotecard(string name)
        {
            CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNotecard");
-            m_host.AddScriptLPS(1);
            string text = LoadNotecard(name);
@@ -2220,7 +2350,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public int osGetNumberOfNotecardLines(string name)
        {
            CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNumberOfNotecardLines");
-            m_host.AddScriptLPS(1);
            UUID assetID = CacheNotecard(name);
@@ -2236,7 +2365,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osAvatarName2Key(string firstname, string lastname)
        {
            CheckThreatLevel(ThreatLevel.Low, "osAvatarName2Key");
-            m_host.AddScriptLPS(1);
            IUserManagement userManager = World.RequestModuleInterface<IUserManagement>();
            if (userManager == null)
@@ -2288,7 +2416,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osKey2Name(string id)
        {
            CheckThreatLevel(ThreatLevel.Low, "osKey2Name");
-            m_host.AddScriptLPS(1);
            UUID key = new UUID();
@@ -2398,7 +2525,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osGetGridNick()
        {
            CheckThreatLevel(ThreatLevel.Moderate, "osGetGridNick");
-            m_host.AddScriptLPS(1);
            string nick = String.Empty;
            IConfigSource config = m_ScriptEngine.ConfigSource;
@@ -2415,7 +2541,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osGetGridName()
        {
            CheckThreatLevel(ThreatLevel.Moderate, "osGetGridName");
-            m_host.AddScriptLPS(1);
            string name = String.Empty;
            IConfigSource config = m_ScriptEngine.ConfigSource;
@@ -2432,7 +2557,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osGetGridLoginURI()
        {
            CheckThreatLevel(ThreatLevel.Moderate, "osGetGridLoginURI");
-            m_host.AddScriptLPS(1);
            string loginURI = String.Empty;
            IConfigSource config = m_ScriptEngine.ConfigSource;
@@ -2449,7 +2573,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osGetGridHomeURI()
        {
            CheckThreatLevel(ThreatLevel.Moderate, "osGetGridHomeURI");
-            m_host.AddScriptLPS(1);
            IConfigSource config = m_ScriptEngine.ConfigSource;
            string HomeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI",
@@ -2471,7 +2594,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osGetGridGatekeeperURI()
        {
            CheckThreatLevel(ThreatLevel.Moderate, "osGetGridGatekeeperURI");
-            m_host.AddScriptLPS(1);
            IConfigSource config = m_ScriptEngine.ConfigSource;
            string gatekeeperURI = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
@@ -2490,7 +2612,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osGetGridCustom(string key)
        {
            CheckThreatLevel(ThreatLevel.Moderate, "osGetGridCustom");
-            m_host.AddScriptLPS(1);
            string retval = String.Empty;
            IConfigSource config = m_ScriptEngine.ConfigSource;
@@ -2507,7 +2628,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osGetAvatarHomeURI(string uuid)
        {
            CheckThreatLevel(ThreatLevel.Low, "osGetAvatarHomeURI");
-            m_host.AddScriptLPS(1);
            IUserManagement userManager = m_ScriptEngine.World.RequestModuleInterface<IUserManagement>();
            string returnValue = "";
@@ -2540,7 +2660,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_String osFormatString(string str, LSL_List strings)
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osFormatString");
-            m_host.AddScriptLPS(1);
            return String.Format(str, strings.Data);
        }
@@ -2548,7 +2667,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_List osMatchString(string src, string pattern, int start)
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osMatchString");
-            m_host.AddScriptLPS(1);
            LSL_List result = new LSL_List();
@@ -2590,7 +2708,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_String osReplaceString(string src, string pattern, string replace, int count, int start)
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osReplaceString");
-            m_host.AddScriptLPS(1);
            // Normalize indices (if negative).
            // After normlaization they may still be
@@ -2615,7 +2732,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osLoadedCreationDate()
        {
            CheckThreatLevel(ThreatLevel.Low, "osLoadedCreationDate");
-            m_host.AddScriptLPS(1);
            return World.RegionInfo.RegionSettings.LoadedCreationDate;
        }
@@ -2623,7 +2739,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osLoadedCreationTime()
        {
            CheckThreatLevel(ThreatLevel.Low, "osLoadedCreationTime");
-            m_host.AddScriptLPS(1);
            return World.RegionInfo.RegionSettings.LoadedCreationTime;
        }
@@ -2631,7 +2746,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osLoadedCreationID()
        {
            CheckThreatLevel(ThreatLevel.Low, "osLoadedCreationID");
-            m_host.AddScriptLPS(1);
            return World.RegionInfo.RegionSettings.LoadedCreationID;
        }
@@ -2652,7 +2766,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules)
        {
            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.
@@ -2681,8 +2795,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osForceCreateLink");
-            m_host.AddScriptLPS(1);
            InitLSL();
            ((LSL_Api)m_LSL_Api).CreateLink(target, parent);
        }
@@ -2691,8 +2803,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osForceBreakLink");
-            m_host.AddScriptLPS(1);
            InitLSL();
            ((LSL_Api)m_LSL_Api).BreakLink(linknum);
        }
@@ -2701,16 +2811,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osForceBreakAllLinks");
-            m_host.AddScriptLPS(1);
            InitLSL();
            ((LSL_Api)m_LSL_Api).BreakAllLinks();
        }
        public LSL_Integer osIsNpc(LSL_Key npc)
        {
-            CheckThreatLevel(ThreatLevel.None, "osIsNpc");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
@@ -2727,7 +2834,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
-            m_host.AddScriptLPS(1);
            // have to get the npc module also here to set the default Not Owned
            INPCModule module = World.RequestModuleInterface<INPCModule>();
@@ -2742,7 +2848,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
-            m_host.AddScriptLPS(1);
            return NpcCreate(
                firstname, lastname, position, notecard,
@@ -2885,7 +2990,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Key osNpcSaveAppearance(LSL_Key npc, string notecard)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcSaveAppearance");
-            m_host.AddScriptLPS(1);
            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
@@ -2907,7 +3011,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcLoadAppearance(LSL_Key npc, string notecard)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcLoadAppearance");
-            m_host.AddScriptLPS(1);
            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
@@ -2939,7 +3042,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Key osNpcGetOwner(LSL_Key npc)
        {
            CheckThreatLevel(ThreatLevel.None, "osNpcGetOwner");
-            m_host.AddScriptLPS(1);
            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
            if (npcModule != null)
@@ -2961,7 +3063,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Vector osNpcGetPos(LSL_Key npc)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcGetPos");
-            m_host.AddScriptLPS(1);
            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
            if (npcModule != null)
@@ -2985,7 +3086,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcMoveTo(LSL_Key npc, LSL_Vector pos)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcMoveTo");
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
@@ -3004,7 +3104,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcMoveToTarget(LSL_Key npc, LSL_Vector target, int options)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcMoveToTarget");
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
@@ -3029,7 +3128,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Rotation osNpcGetRot(LSL_Key npc)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcGetRot");
-            m_host.AddScriptLPS(1);
            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
            if (npcModule != null)
@@ -3053,7 +3151,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcSetRot(LSL_Key npc, LSL_Rotation rotation)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcSetRot");
-            m_host.AddScriptLPS(1);
            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
            if (npcModule != null)
@@ -3075,7 +3172,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcStopMoveToTarget(LSL_Key npc)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcStopMoveToTarget");
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
@@ -3092,7 +3188,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcSetProfileAbout(LSL_Key npc, string about)
        {
            CheckThreatLevel(ThreatLevel.Low, "osNpcSetProfileAbout");
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
@@ -3111,7 +3206,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcSetProfileImage(LSL_Key npc, string image)
        {
            CheckThreatLevel(ThreatLevel.Low, "osNpcSetProfileImage");
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
@@ -3145,7 +3239,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcSay(LSL_Key npc, int channel, string message)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcSay");
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
@@ -3162,7 +3255,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcShout(LSL_Key npc, int channel, string message)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcShout");
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
@@ -3179,7 +3271,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcSit(LSL_Key npc, LSL_Key target, int options)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcSit");
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
@@ -3196,7 +3287,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcStand(LSL_Key npc)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcStand");
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
@@ -3213,7 +3303,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcRemove(LSL_Key npc)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcRemove");
-            m_host.AddScriptLPS(1);
            try
            {
@@ -3234,7 +3323,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcPlayAnimation(LSL_Key npc, string animation)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcPlayAnimation");
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
@@ -3249,7 +3337,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcStopAnimation(LSL_Key npc, string animation)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcStopAnimation");
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
@@ -3264,7 +3351,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcWhisper(LSL_Key npc, int channel, string message)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcWhisper");
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
@@ -3281,7 +3367,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcTouch(LSL_Key npcLSL_Key, LSL_Key object_key, LSL_Integer link_num)
        {
            CheckThreatLevel(ThreatLevel.High, "osNpcTouch");
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            int linkNum = link_num.value;
@@ -3326,7 +3411,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Key osOwnerSaveAppearance(string notecard)
        {
            CheckThreatLevel(ThreatLevel.High, "osOwnerSaveAppearance");
-            m_host.AddScriptLPS(1);
            return SaveAppearanceToNotecard(m_host.OwnerID, notecard);
        }
@@ -3334,7 +3418,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Key osAgentSaveAppearance(LSL_Key avatarId, string notecard)
        {
            CheckThreatLevel(ThreatLevel.VeryHigh, "osAgentSaveAppearance");
-            m_host.AddScriptLPS(1);
            return SaveAppearanceToNotecard(avatarId, notecard);
        }
@@ -3387,7 +3470,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_String osGetGender(LSL_Key rawAvatarId)
        {
            CheckThreatLevel(ThreatLevel.None, "osGetGender");
-            m_host.AddScriptLPS(1);
            UUID avatarId;
            if (!UUID.TryParse(rawAvatarId, out avatarId))
@@ -3430,8 +3512,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public LSL_Key osGetMapTexture()
        {
-            CheckThreatLevel(ThreatLevel.None, "osGetMapTexture");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            return m_ScriptEngine.World.RegionInfo.RegionSettings.TerrainImageID.ToString();
        }
@@ -3444,7 +3525,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Key osGetRegionMapTexture(string regionName)
        {
            CheckThreatLevel(ThreatLevel.High, "osGetRegionMapTexture");
-            m_host.AddScriptLPS(1);
            Scene scene = m_ScriptEngine.World;
            UUID key = UUID.Zero;
@@ -3475,7 +3555,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_List osGetRegionStats()
        {
            CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats");
-            m_host.AddScriptLPS(1);
            LSL_List ret = new LSL_List();
            float[] stats = World.StatsReporter.LastReportedSimStats;
@@ -3488,8 +3568,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Vector osGetRegionSize()
        {
-            CheckThreatLevel(ThreatLevel.None, "osGetRegionSize");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            Scene scene = m_ScriptEngine.World;
            RegionInfo reg =  World.RegionInfo;
@@ -3501,7 +3580,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public int osGetSimulatorMemory()
        {
            CheckThreatLevel(ThreatLevel.Moderate, "osGetSimulatorMemory");
-            m_host.AddScriptLPS(1);
            long pws = System.Diagnostics.Process.GetCurrentProcess().WorkingSet64;
            if (pws > Int32.MaxValue)
@@ -3515,7 +3594,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osSetSpeed(string UUID, LSL_Float SpeedModifier)
        {
            CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed");
-            m_host.AddScriptLPS(1);
            ScenePresence avatar = World.GetScenePresence(new UUID(UUID));
            if (avatar != null)
@@ -3525,7 +3604,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osKickAvatar(string FirstName, string SurName, string alert)
        {
            CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar");
-            m_host.AddScriptLPS(1);
            World.ForEachRootScenePresence(delegate(ScenePresence sp)
            {
@@ -3544,7 +3622,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        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));
@@ -3556,7 +3633,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osCauseDamage(string avatar, double damage)
        {
            CheckThreatLevel(ThreatLevel.High, "osCauseDamage");
-            m_host.AddScriptLPS(1);
            UUID avatarId = new UUID(avatar);
            Vector3 pos = m_host.GetWorldPosition();
@@ -3584,7 +3660,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osCauseHealing(string avatar, double healing)
        {
            CheckThreatLevel(ThreatLevel.High, "osCauseHealing");
-            m_host.AddScriptLPS(1);
            UUID avatarId = new UUID(avatar);
            ScenePresence presence = World.GetScenePresence(avatarId);
@@ -3604,7 +3679,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osSetHealth(string avatar, double health)
        {
            CheckThreatLevel(ThreatLevel.High, "osSetHealth");
-            m_host.AddScriptLPS(1);
            UUID avatarId = new UUID(avatar);
            ScenePresence presence = World.GetScenePresence(avatarId);
@@ -3623,7 +3697,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osSetHealRate(string avatar, double healrate)
        {
            CheckThreatLevel(ThreatLevel.High, "osSetHealRate");
-            m_host.AddScriptLPS(1);
            UUID avatarId = new UUID(avatar);
            ScenePresence presence = World.GetScenePresence(avatarId);
@@ -3635,7 +3708,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Float osGetHealRate(string avatar)
        {
            CheckThreatLevel(ThreatLevel.None, "osGetHealRate");
-            m_host.AddScriptLPS(1);
            LSL_Float rate = new LSL_Float(0);
            ScenePresence presence = World.GetScenePresence(new UUID(avatar));
@@ -3647,18 +3719,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules)
        {
            CheckThreatLevel(ThreatLevel.High, "osGetPrimitiveParams");
-            m_host.AddScriptLPS(1);
-            InitLSL();
+            InitLSL();
            return m_LSL_Api.GetPrimitiveParamsEx(prim, rules);
        }
        public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules)
        {
            CheckThreatLevel(ThreatLevel.High, "osSetPrimitiveParams");
-            m_host.AddScriptLPS(1);
-            InitLSL();
+            InitLSL();
            m_LSL_Api.SetPrimitiveParamsEx(prim, rules, "osSetPrimitiveParams");
        }
@@ -3667,8 +3737,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// </summary>
        public void osSetProjectionParams(bool projection, LSL_Key texture, double fov, double focus, double amb)
        {
-            CheckThreatLevel(ThreatLevel.High, "osSetProjectionParams");
            osSetProjectionParams(UUID.Zero.ToString(), projection, texture, fov, focus, amb);
        }
@@ -3678,7 +3746,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osSetProjectionParams(LSL_Key prim, bool projection, LSL_Key texture, double fov, double focus, double amb)
        {
            CheckThreatLevel(ThreatLevel.High, "osSetProjectionParams");
-            m_host.AddScriptLPS(1);
            SceneObjectPart obj = null;
            if (prim == UUID.Zero.ToString())
@@ -3709,12 +3776,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_List osGetAvatarList()
        {
            CheckThreatLevel(ThreatLevel.None, "osGetAvatarList");
-            m_host.AddScriptLPS(1);
            LSL_List result = new LSL_List();
            World.ForEachRootScenePresence(delegate (ScenePresence avatar)
            {
-                if (avatar != null && avatar.UUID != m_host.OwnerID)
+                if (avatar != null && !avatar.IsDeleted && avatar.UUID != m_host.OwnerID )
+                {
+                    result.Add(new LSL_String(avatar.UUID.ToString()));
+                    result.Add(new LSL_Vector(avatar.AbsolutePosition));
+                    result.Add(new LSL_String(avatar.Name));
+                }
+            });
+            return result;
+        }
+        public LSL_List osGetNPCList()
+        {
+            CheckThreatLevel(ThreatLevel.None, "osGetNPCList");
+            LSL_List result = new LSL_List();
+            World.ForEachRootScenePresence(delegate (ScenePresence avatar)
+            {
+                // npcs are not childagents but that is now.
+                if (avatar != null && avatar.IsNPC && !avatar.IsDeleted && !avatar.IsChildAgent && !avatar.IsInTransit)
                {
                    result.Add(new LSL_String(avatar.UUID.ToString()));
                    result.Add(new LSL_Vector(avatar.AbsolutePosition));
@@ -3733,7 +3818,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_String osUnixTimeToTimestamp(long time)
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osUnixTimeToTimestamp");
-            m_host.AddScriptLPS(1);
            long baseTicks = 621355968000000000;
            long tickResolution = 10000000;
@@ -3750,7 +3834,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns>Item description</returns>
        public LSL_String osGetInventoryDesc(string item)
        {
-            m_host.AddScriptLPS(1);
+            CheckThreatLevel();
            lock (m_host.TaskInventory)
            {
@@ -3774,7 +3858,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Integer osInviteToGroup(LSL_Key agentId)
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osInviteToGroup");
-            m_host.AddScriptLPS(1);
            UUID agent = new UUID(agentId);
@@ -3809,7 +3892,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Integer osEjectFromGroup(LSL_Key agentId)
        {
            CheckThreatLevel(ThreatLevel.VeryLow, "osEjectFromGroup");
-            m_host.AddScriptLPS(1);
            UUID agent = new UUID(agentId);
@@ -3845,7 +3927,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.High, "osSetTerrainTexture");
-            m_host.AddScriptLPS(1);
            //Check to make sure that the script's owner is the estate manager/master
            //World.Permissions.GenericEstatePermission(
            if (World.Permissions.IsGod(m_host.OwnerID))
@@ -3875,7 +3956,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.High, "osSetTerrainTextureHeight");
-            m_host.AddScriptLPS(1);
            //Check to make sure that the script's owner is the estate manager/master
            //World.Permissions.GenericEstatePermission(
            if (World.Permissions.IsGod(m_host.OwnerID))
@@ -3896,8 +3976,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.High, "osForceAttachToAvatar");
-            m_host.AddScriptLPS(1);
            InitLSL();
            ((LSL_Api)m_LSL_Api).AttachToAvatar(attachmentPoint);
        }
@@ -3906,8 +3984,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.High, "osForceAttachToAvatarFromInventory");
-            m_host.AddScriptLPS(1);
            ForceAttachToAvatarFromInventory(m_host.OwnerID, itemName, attachmentPoint);
        }
@@ -3915,8 +3991,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.VeryHigh, "osForceAttachToOtherAvatarFromInventory");
-            m_host.AddScriptLPS(1);
            UUID avatarId;
            if (!UUID.TryParse(rawAvatarId, out avatarId))
@@ -3976,8 +4050,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.High, "osForceDetachFromAvatar");
-            m_host.AddScriptLPS(1);
            InitLSL();
            ((LSL_Api)m_LSL_Api).DetachFromAvatar();
        }
@@ -3986,8 +4058,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            CheckThreatLevel(ThreatLevel.Moderate, "osGetNumberOfAttachments");
-            m_host.AddScriptLPS(1);
            UUID targetUUID;
            ScenePresence target;
            LSL_List resp = new LSL_List();
@@ -4021,7 +4091,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osMessageAttachments(LSL_Key avatar, string message, LSL_List attachmentPoints, int options)
        {
            CheckThreatLevel(ThreatLevel.Moderate, "osMessageAttachments");
-            m_host.AddScriptLPS(1);
            UUID targetUUID;
            if(!UUID.TryParse(avatar.ToString(), out targetUUID))
@@ -4130,8 +4199,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns>1 if thing is a valid UUID, 0 otherwise</returns>
        public LSL_Integer osIsUUID(string thing)
        {
-            CheckThreatLevel(ThreatLevel.None, "osIsUUID");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            UUID test;
            return UUID.TryParse(thing, out test) ? 1 : 0;
@@ -4145,8 +4213,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public LSL_Float osMin(double a, double b)
        {
-            CheckThreatLevel(ThreatLevel.None, "osMin");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            return Math.Min(a, b);
        }
@@ -4159,8 +4226,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public LSL_Float osMax(double a, double b)
        {
-            CheckThreatLevel(ThreatLevel.None, "osMax");
+            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            return Math.Max(a, b);
        }
@@ -4168,7 +4234,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Key osGetRezzingObject()
        {
            CheckThreatLevel(ThreatLevel.None, "osGetRezzingObject");
-            m_host.AddScriptLPS(1);
            UUID rezID = m_host.ParentGroup.RezzerID;
            if(rezID == UUID.Zero || m_host.ParentGroup.Scene.GetScenePresence(rezID) != null)
                return new LSL_Key(UUID.Zero.ToString());
@@ -4193,7 +4259,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns>boolean indicating whether an error was shouted.</returns>
        protected bool ShoutErrorOnLackingOwnerPerms(int perms, string errorPrefix)
        {
-            m_host.AddScriptLPS(1);
            bool fail = false;
            if (m_item.PermsGranter != m_host.OwnerID)
            {
@@ -4244,7 +4309,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osDropAttachment()
        {
            CheckThreatLevel(ThreatLevel.Moderate, "osDropAttachment");
-            m_host.AddScriptLPS(1);
            DropAttachment(true);
        }
@@ -4252,7 +4316,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osForceDropAttachment()
        {
            CheckThreatLevel(ThreatLevel.High, "osForceDropAttachment");
-            m_host.AddScriptLPS(1);
            DropAttachment(false);
        }
@@ -4260,7 +4323,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osDropAttachmentAt(LSL_Vector pos, LSL_Rotation rot)
        {
            CheckThreatLevel(ThreatLevel.Moderate, "osDropAttachmentAt");
-            m_host.AddScriptLPS(1);
            DropAttachmentAt(true, pos, rot);
        }
@@ -4268,7 +4330,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osForceDropAttachmentAt(LSL_Vector pos, LSL_Rotation rot)
        {
            CheckThreatLevel(ThreatLevel.High, "osForceDropAttachmentAt");
-            m_host.AddScriptLPS(1);
            DropAttachmentAt(false, pos, rot);
        }
@@ -4276,7 +4337,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Integer osListenRegex(int channelID, string name, string ID, string msg, int regexBitfield)
        {
            CheckThreatLevel(ThreatLevel.Low, "osListenRegex");
-            m_host.AddScriptLPS(1);
            UUID keyID;
            UUID.TryParse(ID, out keyID);
@@ -4324,7 +4385,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Integer osRegexIsMatch(string input, string pattern)
        {
            CheckThreatLevel(ThreatLevel.Low, "osRegexIsMatch");
-            m_host.AddScriptLPS(1);
            try
            {
                return Regex.IsMatch(input, pattern) ? 1 : 0;
@@ -4339,7 +4400,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_String osRequestURL(LSL_List options)
        {
            CheckThreatLevel(ThreatLevel.Moderate, "osRequestSecureURL");
-            m_host.AddScriptLPS(1);
            Hashtable opts = new Hashtable();
            for (int i = 0 ; i < options.Length ; i++)
@@ -4357,7 +4417,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_String osRequestSecureURL(LSL_List options)
        {
            CheckThreatLevel(ThreatLevel.Moderate, "osRequestSecureURL");
-            m_host.AddScriptLPS(1);
            Hashtable opts = new Hashtable();
            for (int i = 0 ; i < options.Length ; i++)
@@ -4375,7 +4434,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osCollisionSound(string impact_sound, double impact_volume)
        {
            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            if(impact_sound == "")
            {
@@ -4408,7 +4466,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osVolumeDetect(int detect)
        {
            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            if (m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted || m_host.ParentGroup.IsAttachment)
                return;
@@ -4431,7 +4488,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_List osGetInertiaData()
        {
            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            LSL_List result = new LSL_List();
            float TotalMass;
@@ -4479,7 +4535,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osSetInertia(LSL_Float mass, LSL_Vector centerOfMass, LSL_Vector principalInertiaScaled,  LSL_Rotation lslrot)
        {
            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            SceneObjectGroup sog = m_host.ParentGroup;
            if(sog== null || sog.IsDeleted)
@@ -4518,7 +4573,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osSetInertiaAsBox(LSL_Float mass, LSL_Vector boxSize, LSL_Vector centerOfMass, LSL_Rotation lslrot)
        {
            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            SceneObjectGroup sog = m_host.ParentGroup;
            if(sog== null || sog.IsDeleted)
@@ -4560,7 +4614,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osSetInertiaAsSphere(LSL_Float mass,  LSL_Float radius, LSL_Vector centerOfMass)
        {
            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            SceneObjectGroup sog = m_host.ParentGroup;
            if(sog== null || sog.IsDeleted)
@@ -4600,7 +4653,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osSetInertiaAsCylinder(LSL_Float mass,  LSL_Float radius, LSL_Float lenght, LSL_Vector centerOfMass, LSL_Rotation lslrot)
        {
            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            SceneObjectGroup sog = m_host.ParentGroup;
            if(sog== null || sog.IsDeleted)
@@ -4639,7 +4691,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osClearInertia()
        {
            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            SceneObjectGroup sog = m_host.ParentGroup;
            if(sog== null || sog.IsDeleted)
@@ -4648,6 +4699,37 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            sog.SetInertiaData(-1, Vector3.Zero, Vector3.Zero, Vector4.Zero );
        }
+        private bool checkAllowObjectTPbyLandOwner(Vector3 pos)
+        {
+            ILandObject land = World.LandChannel.GetLandObject(pos);
+            if(land == null)
+                return true;
+            LandData landdata = land.LandData;
+            if(landdata == null)
+                return true;
+            UUID hostOwner = m_host.OwnerID;
+            if(landdata.OwnerID == hostOwner)
+                return true;
+            EstateSettings es = World.RegionInfo.EstateSettings;
+            if(es != null && es.IsEstateManagerOrOwner(hostOwner))
+                return true;
+            if(!landdata.IsGroupOwned)
+                return false;
+            UUID landGroup = landdata.GroupID;
+            if(landGroup == UUID.Zero)
+                return false;
+            if(landGroup == m_host.GroupID)
+                return true;
+            return false;
+        }
       /// <summary>
        /// teleports a object (full linkset)
        /// </summary>
@@ -4667,7 +4749,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Integer osTeleportObject(LSL_Key objectUUID, LSL_Vector targetPos, LSL_Rotation rotation, LSL_Integer flags)
        {
            CheckThreatLevel(ThreatLevel.Severe, "osTeleportObject");
-            m_host.AddScriptLPS(1);
            UUID objUUID;
            if (!UUID.TryParse(objectUUID, out objUUID))
@@ -4677,9 +4758,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            }
            SceneObjectGroup sog = World.GetSceneObjectGroup(objUUID);
-            if(sog== null || sog.IsDeleted)
+            if(sog== null || sog.IsDeleted || sog.inTransit)
                return -1;
+            if(sog.OwnerID != m_host.OwnerID)
+            {
+                Vector3 pos = sog.AbsolutePosition;
+                if(!checkAllowObjectTPbyLandOwner(pos))
+                    return -1;
+            }
            UUID myid = m_host.ParentGroup.UUID;
            return sog.TeleportObject(myid, targetPos, rotation, flags);
@@ -4689,7 +4777,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Integer osGetLinkNumber(LSL_String name)
        {
            CheckThreatLevel();
-            m_host.AddScriptLPS(1);
            SceneObjectGroup sog = m_host.ParentGroup;
            if(sog== null || sog.IsDeleted)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index bd5d008..8f863af 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -123,6 +123,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
        string osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams,
                                           bool blend, int disp, int timer, int alpha, int face);
        string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, int timer);
+        string osSetDynamicTextureDataFace(string dynamicID, string contentType, string data, string extraParams, int timer, int face);
        string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams,
                                            int timer, int alpha);
        string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams,
@@ -143,8 +144,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
        void osSetParcelSIPAddress(string SIPAddress);
        // Avatar Info Commands
-        string osGetAgentIP(string agent);
        LSL_List osGetAgents();
+        string osGetAgentIP(string agent);
        // Teleport commands
        void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
@@ -222,10 +223,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
        string osDrawLine(string drawList, int endX, int endY);
        string osDrawText(string drawList, string text);
        string osDrawEllipse(string drawList, int width, int height);
+        string osDrawFilledEllipse(string drawList, int width, int height);
        string osDrawRectangle(string drawList, int width, int height);
        string osDrawFilledRectangle(string drawList, int width, int height);
        string osDrawPolygon(string drawList, LSL_List x, LSL_List y);
        string osDrawFilledPolygon(string drawList, LSL_List x, LSL_List y);
+        string osDrawResetTransform(string drawList);
+        string osDrawRotationTransform(string drawList, LSL_Float x);
+        string osDrawScaleTransform(string drawList, LSL_Float x, LSL_Float y);
+        string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y);
        string osSetFontName(string drawList, string fontName);
        string osSetFontSize(string drawList, int fontSize);
        string osSetPenSize(string drawList, int penSize);
@@ -389,6 +395,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
        void osSetProjectionParams(LSL_Key prim, bool projection, LSL_Key texture, double fov, double focus, double amb);
        LSL_List osGetAvatarList();
+        LSL_List osGetNPCList();
        LSL_String osUnixTimeToTimestamp(long time);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index a277f6c..e4c1ca0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -697,7 +697,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
        public const int PARCEL_DETAILS_GROUP = 3;
        public const int PARCEL_DETAILS_AREA = 4;
        public const int PARCEL_DETAILS_ID = 5;
-        public const int PARCEL_DETAILS_SEE_AVATARS = 6; // not implemented
+        public const int PARCEL_DETAILS_SEE_AVATARS = 6;
+        public const int PARCEL_DETAILS_ANY_AVATAR_SOUNDS = 7;
+        public const int PARCEL_DETAILS_GROUP_SOUNDS = 8;
        //osSetParcelDetails
        public const int PARCEL_DETAILS_CLAIMDATE = 10;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 9eac114..42e7bfb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -153,6 +153,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
            return m_OSSL_Functions.osSetDynamicTextureData(dynamicID, contentType, data, extraParams, timer);
        }
+        public string osSetDynamicTextureDataFace(string dynamicID, string contentType, string data, string extraParams,
+                                             int timer, int face)
+        {
+            return m_OSSL_Functions.osSetDynamicTextureDataFace(dynamicID, contentType, data, extraParams, timer, face);
+        }
        public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams,
                                           int timer, int alpha)
        {
@@ -271,15 +277,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
            m_OSSL_Functions.osTeleportOwner(position, lookat);
        }
-        // Avatar info functions
+        public LSL_List osGetAgents()
-        public string osGetAgentIP(string agent)
        {
-            return m_OSSL_Functions.osGetAgentIP(agent);
+            return m_OSSL_Functions.osGetAgents();
        }
-        public LSL_List osGetAgents()
+        public string osGetAgentIP(string agent)
        {
-            return m_OSSL_Functions.osGetAgents();
+            return m_OSSL_Functions.osGetAgentIP(agent);
        }
        // Animation Functions
@@ -355,6 +360,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
            return m_OSSL_Functions.osDrawEllipse(drawList, width, height);
        }
+        public string osDrawFilledEllipse(string drawList, int width, int height)
+        {
+            return m_OSSL_Functions.osDrawFilledEllipse(drawList, width, height);
+        }
        public string osDrawRectangle(string drawList, int width, int height)
        {
            return m_OSSL_Functions.osDrawRectangle(drawList, width, height);
@@ -375,6 +385,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
            return m_OSSL_Functions.osDrawFilledPolygon(drawList, x, y);
        }
+        public string osDrawResetTransform(string drawList)
+        {
+            return m_OSSL_Functions.osDrawResetTransform(drawList);
+        }
+        public string osDrawRotationTransform(string drawList, LSL_Float x)
+        {
+            return m_OSSL_Functions.osDrawRotationTransform(drawList, x);
+        }
+        public string osDrawScaleTransform(string drawList, LSL_Float x, LSL_Float y)
+        {
+            return m_OSSL_Functions.osDrawScaleTransform(drawList, x, y);
+        }
+        public string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y)
+        {
+            return m_OSSL_Functions.osDrawTranslationTransform(drawList, x, y);
+        }
        public string osSetFontSize(string drawList, int fontSize)
        {
            return m_OSSL_Functions.osSetFontSize(drawList, fontSize);
@@ -399,6 +429,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
        {
            return m_OSSL_Functions.osSetPenColor(drawList, color);
        }
        // Deprecated
        public string osSetPenColour(string drawList, string colour)
        {
@@ -1010,6 +1041,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
            return m_OSSL_Functions.osGetAvatarList();
        }
+        public LSL_List osGetNPCList()
+        {
+            return m_OSSL_Functions.osGetNPCList();
+        }
        public LSL_String osUnixTimeToTimestamp(long time)
        {
            return m_OSSL_Functions.osUnixTimeToTimestamp(time);
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 4d7a698..8780e49 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -39,7 +39,6 @@ using OMV_Quaternion = OpenMetaverse.Quaternion;
 namespace OpenSim.Region.ScriptEngine.Shared
 {
-    [Serializable]
    public partial class LSL_Types
    {
        // Types are kept is separate .dll to avoid having to add whatever .dll it is in it to script AppDomain
@@ -526,7 +525,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
        }
        [Serializable]
-        public class list
+        public class list: MarshalByRefObject
        {
            private object[] m_data;