Merge branch 'careminster' into tests

7 files changed, 400 insertions, 250 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 50b2fb5..8274fbf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics; //for [DebuggerNonUserCode]
 using System.Runtime.Remoting.Lifetime;
 using System.Text;
 using System.Threading;
@@ -151,6 +152,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             get { return m_ScriptEngine.World; }
         }
 
+        [DebuggerNonUserCode]
         public void state(string newState)
         {
             m_ScriptEngine.SetState(m_itemID, newState);
@@ -160,6 +162,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// Reset the named script. The script must be present
         /// in the same prim.
         /// </summary>
+        [DebuggerNonUserCode]
         public void llResetScript()
         {
             m_host.AddScriptLPS(1);
@@ -272,40 +275,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         protected UUID InventorySelf()
         {
             UUID invItemID = new UUID();
-
-            lock (m_host.TaskInventory)
+            bool unlock = false;
+            if (!m_host.TaskInventory.IsReadLockedByMe())
+            {
+                m_host.TaskInventory.LockItemsForRead(true);
+                unlock = true;
+            }
+            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
             {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID)
                 {
-                    if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID)
-                    {
-                        invItemID = inv.Key;
-                        break;
-                    }
+                    invItemID = inv.Key;
+                    break;
                 }
             }
-
+            if (unlock)
+            {
+                m_host.TaskInventory.LockItemsForRead(false);
+            }
             return invItemID;
         }
 
         protected UUID InventoryKey(string name, int type)
         {
             m_host.AddScriptLPS(1);
-
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            
+            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
             {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                if (inv.Value.Name == name)
                 {
-                    if (inv.Value.Name == name)
+                    m_host.TaskInventory.LockItemsForRead(false);
+                    
+                    if (inv.Value.Type != type)
                     {
-                        if (inv.Value.Type != type)
-                            return UUID.Zero;
-
-                        return inv.Value.AssetID;
+                        return UUID.Zero;
                     }
+
+                    return inv.Value.AssetID;
                 }
             }
 
+            m_host.TaskInventory.LockItemsForRead(false);
             return UUID.Zero;
         }
 
@@ -313,17 +324,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            lock (m_host.TaskInventory)
+            
+            m_host.TaskInventory.LockItemsForRead(true);
+
+            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
             {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                if (inv.Value.Name == name)
                 {
-                    if (inv.Value.Name == name)
-                    {
-                        return inv.Value.AssetID;
-                    }
+                    m_host.TaskInventory.LockItemsForRead(false);
+                    return inv.Value.AssetID;
                 }
             }
 
+            m_host.TaskInventory.LockItemsForRead(false);
+
+
             return UUID.Zero;
         }
 
@@ -1987,6 +2002,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
 //KF:  Do NOT use this next line if using ODE physics engine. This need a switch based on .ini Phys Engine type
 //          part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition;
+            
+            // So, after thinking about this for a bit, the issue with the part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition line
+            // is it isn't compatible with vehicles because it causes the vehicle body to have to be broken down and rebuilt
+            // It's perfectly okay when the object is not an active physical body though.
+            // So, part.ParentGroup.ResetChildPrimPhysicsPositions(); does the thing that Kitto is warning against
+            // but only if the object is not physial and active.   This is important for rotating doors.
+            // without the absoluteposition = absoluteposition happening, the doors do not move in the physics
+            // scene
+            if (part.PhysActor != null && !part.PhysActor.IsPhysical)
+            {
+                part.ParentGroup.ResetChildPrimPhysicsPositions();
+            }
         }
 
         /// <summary>
@@ -2534,12 +2561,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             m_host.AddScriptLPS(1);
 
+            m_host.TaskInventory.LockItemsForRead(true);
             TaskInventoryItem item = m_host.TaskInventory[invItemID];
-
-            lock (m_host.TaskInventory)
-            {
-                item = m_host.TaskInventory[invItemID];
-            }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             if (item.PermsGranter == UUID.Zero)
                 return 0;
@@ -2614,6 +2638,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (dist > m_ScriptDistanceFactor * 10.0f)
                 return;
 
+            //Clone is thread-safe
             TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
 
             foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory)
@@ -2747,13 +2772,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             TaskInventoryItem item;
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
             {
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-                    return;
-                else
-                    item = m_host.TaskInventory[InventorySelf()];
+                m_host.TaskInventory.LockItemsForRead(false);
+                return;
             }
+            else
+            {
+                item = m_host.TaskInventory[InventorySelf()];
+            }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             if (item.PermsGranter != UUID.Zero)
             {
@@ -2775,13 +2804,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             TaskInventoryItem item;
 
+            m_host.TaskInventory.LockItemsForRead(true);
             lock (m_host.TaskInventory)
             {
+                
                 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
+                {
+                    m_host.TaskInventory.LockItemsForRead(false);
                     return;
+                }
                 else
+                {
                     item = m_host.TaskInventory[InventorySelf()];
+                }
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             m_host.AddScriptLPS(1);
 
@@ -2818,14 +2855,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             TaskInventoryItem item;
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+
+            if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
             {
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-                    return;
-                else
-                    item = m_host.TaskInventory[InventorySelf()];
+                m_host.TaskInventory.LockItemsForRead(false);
+                return;
+            }
+            else
+            {
+                item = m_host.TaskInventory[InventorySelf()];
             }
 
+            m_host.TaskInventory.LockItemsForRead(false);
+
             if (item.PermsGranter != m_host.OwnerID)
                 return;
 
@@ -2850,13 +2893,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             TaskInventoryItem item;
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+
+            if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
             {
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-                    return;
-                else
-                    item = m_host.TaskInventory[InventorySelf()];
+                m_host.TaskInventory.LockItemsForRead(false);
+                return;
+            }
+            else
+            {
+                item = m_host.TaskInventory[InventorySelf()];
             }
+            m_host.TaskInventory.LockItemsForRead(false);
+
 
             if (item.PermsGranter != m_host.OwnerID)
                 return;
@@ -3080,14 +3129,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             TaskInventoryItem item;
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
             {
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-                    return;
-                else
-                    item = m_host.TaskInventory[InventorySelf()];
+                m_host.TaskInventory.LockItemsForRead(false);
+                return;
             }
-
+            else
+            {
+                item = m_host.TaskInventory[InventorySelf()];
+            }
+            m_host.TaskInventory.LockItemsForRead(false);
             if (item.PermsGranter == UUID.Zero)
                 return;
 
@@ -3117,13 +3169,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             TaskInventoryItem item;
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
             {
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-                    return;
-                else
-                    item = m_host.TaskInventory[InventorySelf()];
+                m_host.TaskInventory.LockItemsForRead(false);
+                return;
+            }
+            else
+            {
+                item = m_host.TaskInventory[InventorySelf()];
             }
+            m_host.TaskInventory.LockItemsForRead(false);
+            
 
             if (item.PermsGranter == UUID.Zero)
                 return;
@@ -3196,10 +3253,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             TaskInventoryItem item;
 
-            lock (m_host.TaskInventory)
+
+            m_host.TaskInventory.LockItemsForRead(true);
+            if (!m_host.TaskInventory.ContainsKey(invItemID))
+            {
+                m_host.TaskInventory.LockItemsForRead(false);
+                return;
+            }
+            else
             {
                 item = m_host.TaskInventory[invItemID];
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             if (agentID == UUID.Zero || perm == 0) // Releasing permissions
             {
@@ -3231,11 +3296,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
                 {
-                    lock (m_host.TaskInventory)
-                    {
-                        m_host.TaskInventory[invItemID].PermsGranter = agentID;
-                        m_host.TaskInventory[invItemID].PermsMask = perm;
-                    }
+                    m_host.TaskInventory.LockItemsForWrite(true);
+                    m_host.TaskInventory[invItemID].PermsGranter = agentID;
+                    m_host.TaskInventory[invItemID].PermsMask = perm;
+                    m_host.TaskInventory.LockItemsForWrite(false);
 
                     m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
                             "run_time_permissions", new Object[] {
@@ -3255,11 +3319,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
                 {
-                    lock (m_host.TaskInventory)
-                    {
-                        m_host.TaskInventory[invItemID].PermsGranter = agentID;
-                        m_host.TaskInventory[invItemID].PermsMask = perm;
-                    }
+                    m_host.TaskInventory.LockItemsForWrite(true);
+                    m_host.TaskInventory[invItemID].PermsGranter = agentID;
+                    m_host.TaskInventory[invItemID].PermsMask = perm;
+                    m_host.TaskInventory.LockItemsForWrite(false);
 
                     m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
                             "run_time_permissions", new Object[] {
@@ -3280,11 +3343,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 if (!m_waitingForScriptAnswer)
                 {
-                    lock (m_host.TaskInventory)
-                    {
-                        m_host.TaskInventory[invItemID].PermsGranter = agentID;
-                        m_host.TaskInventory[invItemID].PermsMask = 0;
-                    }
+                    m_host.TaskInventory.LockItemsForWrite(true);
+                    m_host.TaskInventory[invItemID].PermsGranter = agentID;
+                    m_host.TaskInventory[invItemID].PermsMask = 0;
+                    m_host.TaskInventory.LockItemsForWrite(false);
 
                     presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
                     m_waitingForScriptAnswer=true;
@@ -3319,10 +3381,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
                 llReleaseControls();
 
-            lock (m_host.TaskInventory)
-            {
-                m_host.TaskInventory[invItemID].PermsMask = answer;
-            }
+            
+            m_host.TaskInventory.LockItemsForWrite(true);
+            m_host.TaskInventory[invItemID].PermsMask = answer;
+            m_host.TaskInventory.LockItemsForWrite(false);
+            
 
             m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
                     "run_time_permissions", new Object[] {
@@ -3334,16 +3397,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            
+            foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
             {
-                foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
+                if (item.Type == 10 && item.ItemID == m_itemID)
                 {
-                    if (item.Type == 10 && item.ItemID == m_itemID)
-                    {
-                        return item.PermsGranter.ToString();
-                    }
+                    m_host.TaskInventory.LockItemsForRead(false);
+                    return item.PermsGranter.ToString();
                 }
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             return UUID.Zero.ToString();
         }
@@ -3352,19 +3416,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+
+            foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
             {
-                foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
+                if (item.Type == 10 && item.ItemID == m_itemID)
                 {
-                    if (item.Type == 10 && item.ItemID == m_itemID)
-                    {
-                        int perms = item.PermsMask;
-                        if (m_automaticLinkPermission)
-                            perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
-                        return perms;
-                    }
+                    int perms = item.PermsMask;
+                    if (m_automaticLinkPermission)
+                        perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
+                    m_host.TaskInventory.LockItemsForRead(false);
+                    return perms;
                 }
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             return 0;
         }
@@ -3397,11 +3462,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID invItemID = InventorySelf();
 
             TaskInventoryItem item;
-            lock (m_host.TaskInventory)
-            {
-                item = m_host.TaskInventory[invItemID];
-            }
-
+            m_host.TaskInventory.LockItemsForRead(true);
+            item = m_host.TaskInventory[invItemID];
+            m_host.TaskInventory.LockItemsForRead(false);
+             
             if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
                 && !m_automaticLinkPermission)
             {
@@ -3454,16 +3518,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             UUID invItemID = InventorySelf();
 
-            lock (m_host.TaskInventory)
-            {
+            m_host.TaskInventory.LockItemsForRead(true);
                 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
                     && !m_automaticLinkPermission)
                 {
                     ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
+                    m_host.TaskInventory.LockItemsForRead(false);
                     return;
                 }
-            }
-
+            m_host.TaskInventory.LockItemsForRead(false);
+            
             if (linknum < ScriptBaseClass.LINK_THIS)
                 return;
 
@@ -3632,17 +3696,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             int count = 0;
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
             {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                if (inv.Value.Type == type || type == -1)
                 {
-                    if (inv.Value.Type == type || type == -1)
-                    {
-                        count = count + 1;
-                    }
+                    count = count + 1;
                 }
             }
-
+            
+            m_host.TaskInventory.LockItemsForRead(false);
             return count;
         }
 
@@ -3651,16 +3714,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             ArrayList keys = new ArrayList();
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
             {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                if (inv.Value.Type == type || type == -1)
                 {
-                    if (inv.Value.Type == type || type == -1)
-                    {
-                        keys.Add(inv.Value.Name);
-                    }
+                    keys.Add(inv.Value.Name);
                 }
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             if (keys.Count == 0)
             {
@@ -3697,20 +3759,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             // move the first object found with this inventory name
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
             {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                if (inv.Value.Name == inventory)
                 {
-                    if (inv.Value.Name == inventory)
-                    {
-                        found = true;
-                        objId = inv.Key;
-                        assetType = inv.Value.Type;
-                        objName = inv.Value.Name;
-                        break;
-                    }
+                    found = true;
+                    objId = inv.Key;
+                    assetType = inv.Value.Type;
+                    objName = inv.Value.Name;
+                    break;
                 }
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             if (!found)
             {
@@ -3755,24 +3816,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             ScriptSleep(3000);
         }
 
+        [DebuggerNonUserCode]
         public void llRemoveInventory(string name)
         {
             m_host.AddScriptLPS(1);
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
             {
-                foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
+                if (item.Name == name)
                 {
-                    if (item.Name == name)
-                    {
-                        if (item.ItemID == m_itemID)
-                            throw new ScriptDeleteException();
-                        else
-                            m_host.Inventory.RemoveInventoryItem(item.ItemID);
-                        return;
-                    }
+                    if (item.ItemID == m_itemID)
+                        throw new ScriptDeleteException();
+                    else
+                        m_host.Inventory.RemoveInventoryItem(item.ItemID);
+
+                    m_host.TaskInventory.LockItemsForRead(false);
+                    return;
                 }
             }
+            m_host.TaskInventory.LockItemsForRead(false);
         }
 
         public void llSetText(string text, LSL_Vector color, double alpha)
@@ -3861,6 +3924,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
+            //Clone is thread safe
             TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
 
             foreach (TaskInventoryItem item in itemDictionary.Values)
@@ -3951,17 +4015,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID soundId = UUID.Zero;
             if (!UUID.TryParse(impact_sound, out soundId))
             {
-                lock (m_host.TaskInventory)
+                m_host.TaskInventory.LockItemsForRead(true);
+                foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
                 {
-                    foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
+                    if (item.Type == (int)AssetType.Sound && item.Name == impact_sound)
                     {
-                        if (item.Type == (int)AssetType.Sound && item.Name == impact_sound)
-                        {
-                            soundId = item.AssetID;
-                            break;
-                        }
+                        soundId = item.AssetID;
+                        break;
                     }
                 }
+                m_host.TaskInventory.LockItemsForRead(false);
             }
             m_host.CollisionSound = soundId;
             m_host.CollisionSoundVolume = (float)impact_volume;
@@ -4007,6 +4070,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID partItemID;
             foreach (SceneObjectPart part in parts)
             {
+                //Clone is thread safe
                 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
 
                 foreach (TaskInventoryItem item in itemsDictionary.Values)
@@ -4214,17 +4278,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             m_host.AddScriptLPS(1);
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
             {
-                foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
+                if (item.Type == 10 && item.ItemID == m_itemID)
                 {
-                    if (item.Type == 10 && item.ItemID == m_itemID)
-                    {
-                        result =  item.Name!=null?item.Name:String.Empty;
-                        break;
-                    }
+                    result =  item.Name!=null?item.Name:String.Empty;
+                    break;
                 }
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             return result;
         }
@@ -4482,23 +4545,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
             {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                if (inv.Value.Name == name)
                 {
-                    if (inv.Value.Name == name)
+                    if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
                     {
-                        if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
-                        {
-                            return inv.Value.AssetID.ToString();
-                        }
-                        else
-                        {
-                            return UUID.Zero.ToString();
-                        }
+                        m_host.TaskInventory.LockItemsForRead(false);
+                        return inv.Value.AssetID.ToString();
+                    }
+                    else
+                    {
+                        m_host.TaskInventory.LockItemsForRead(false);
+                        return UUID.Zero.ToString();
                     }
                 }
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             return UUID.Zero.ToString();
         }
@@ -5776,6 +5840,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             return World.SimulatorFPS;
         }
+                
 
         /* particle system rules should be coming into this routine as doubles, that is
         rule[0] should be an integer from this list and rule[1] should be the arg
@@ -5993,14 +6058,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         protected UUID GetTaskInventoryItem(string name)
         {
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
             {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                if (inv.Value.Name == name)
                 {
-                    if (inv.Value.Name == name)
-                        return inv.Key;
+                    m_host.TaskInventory.LockItemsForRead(false);
+                    return inv.Key;
                 }
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             return UUID.Zero;
         }
@@ -6311,22 +6378,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             // copy the first script found with this inventory name
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
             {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                if (inv.Value.Name == name)
                 {
-                    if (inv.Value.Name == name)
+                    // make sure the object is a script
+                    if (10 == inv.Value.Type)
                     {
-                        // make sure the object is a script
-                        if (10 == inv.Value.Type)
-                        {
-                            found = true;
-                            srcId = inv.Key;
-                            break;
-                        }
+                        found = true;
+                        srcId = inv.Key;
+                        break;
                     }
                 }
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             if (!found)
             {
@@ -8129,28 +8195,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
             {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                if (inv.Value.Name == item)
                 {
-                    if (inv.Value.Name == item)
+                    m_host.TaskInventory.LockItemsForRead(false);
+                    switch (mask)
                     {
-                        switch (mask)
-                        {
-                            case 0:
-                                return (int)inv.Value.BasePermissions;
-                            case 1:
-                                return (int)inv.Value.CurrentPermissions;
-                            case 2:
-                                return (int)inv.Value.GroupPermissions;
-                            case 3:
-                                return (int)inv.Value.EveryonePermissions;
-                            case 4:
-                                return (int)inv.Value.NextPermissions;
-                        }
+                        case 0:
+                            return (int)inv.Value.BasePermissions;
+                        case 1:
+                            return (int)inv.Value.CurrentPermissions;
+                        case 2:
+                            return (int)inv.Value.GroupPermissions;
+                        case 3:
+                            return (int)inv.Value.EveryonePermissions;
+                        case 4:
+                            return (int)inv.Value.NextPermissions;
                     }
                 }
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             return -1;
         }
@@ -8165,16 +8231,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
             {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                if (inv.Value.Name == item)
                 {
-                    if (inv.Value.Name == item)
-                    {
-                        return inv.Value.CreatorID.ToString();
-                    }
+                    m_host.TaskInventory.LockItemsForRead(false);
+                    return inv.Value.CreatorID.ToString();
                 }
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             llSay(0, "No item name '" + item + "'");
 
@@ -8698,16 +8764,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
             {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                if (inv.Value.Name == name)
                 {
-                    if (inv.Value.Name == name)
-                    {
-                        return inv.Value.Type;
-                    }
+                    m_host.TaskInventory.LockItemsForRead(false);
+                    return inv.Value.Type;
                 }
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             return -1;
         }
@@ -8738,17 +8804,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (invItemID == UUID.Zero)
                 return new LSL_Vector();
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
             {
-                if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
-                   return new LSL_Vector();
+                m_host.TaskInventory.LockItemsForRead(false);
+                return new LSL_Vector();
+            }
 
-                if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
-                {
-                    ShoutError("No permissions to track the camera");
-                    return new LSL_Vector();
-                }
+            if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
+            {
+                ShoutError("No permissions to track the camera");
+                m_host.TaskInventory.LockItemsForRead(false);
+                return new LSL_Vector();
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
             if (presence != null)
@@ -8766,17 +8835,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (invItemID == UUID.Zero)
                 return new LSL_Rotation();
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
             {
-                if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
-                   return new LSL_Rotation();
-
-                if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
-                {
-                    ShoutError("No permissions to track the camera");
-                    return new LSL_Rotation();
-                }
+                m_host.TaskInventory.LockItemsForRead(false);
+                return new LSL_Rotation();
+            }
+            if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
+            {
+                ShoutError("No permissions to track the camera");
+                m_host.TaskInventory.LockItemsForRead(false);
+                return new LSL_Rotation();
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
             if (presence != null)
@@ -8926,14 +8997,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (objectID == UUID.Zero) return;
 
             UUID agentID;
-            lock (m_host.TaskInventory)
-            {
-                // we need the permission first, to know which avatar we want to set the camera for
-                agentID = m_host.TaskInventory[invItemID].PermsGranter;
+            m_host.TaskInventory.LockItemsForRead(true);
+            // we need the permission first, to know which avatar we want to set the camera for
+            agentID = m_host.TaskInventory[invItemID].PermsGranter;
 
-                if (agentID == UUID.Zero) return;
-                if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
+            if (agentID == UUID.Zero)
+            {
+                m_host.TaskInventory.LockItemsForRead(false);
+                return;
+            }
+            if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
+            {
+                m_host.TaskInventory.LockItemsForRead(false);
+                return;
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             ScenePresence presence = World.GetScenePresence(agentID);
 
@@ -8983,12 +9061,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             // we need the permission first, to know which avatar we want to clear the camera for
             UUID agentID;
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            agentID = m_host.TaskInventory[invItemID].PermsGranter;
+            if (agentID == UUID.Zero)
             {
-                agentID = m_host.TaskInventory[invItemID].PermsGranter;
-                if (agentID == UUID.Zero) return;
-                if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
+                m_host.TaskInventory.LockItemsForRead(false);
+                return;
             }
+            if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
+            {
+                m_host.TaskInventory.LockItemsForRead(false);
+                return;
+            }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             ScenePresence presence = World.GetScenePresence(agentID);
 
@@ -9445,15 +9530,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         internal UUID ScriptByName(string name)
         {
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+
+            foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
             {
-                foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
+                if (item.Type == 10 && item.Name == name)
                 {
-                    if (item.Type == 10 && item.Name == name)
-                        return item.ItemID;
+                    m_host.TaskInventory.LockItemsForRead(false);
+                    return item.ItemID;
                 }
             }
 
+            m_host.TaskInventory.LockItemsForRead(false);
+
             return UUID.Zero;
         }
 
@@ -9494,6 +9583,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
+            //Clone is thread safe
             TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
 
             UUID assetID = UUID.Zero;
@@ -9556,6 +9646,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
+            //Clone is thread safe
             TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
 
             UUID assetID = UUID.Zero;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 7fdbac8..7f739b1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -636,13 +636,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         }
 
         // Teleport functions
-        public void osTeleportAgent(string agent, uint regionX, uint regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
+        public void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
         {
             // High because there is no security check. High griefer potential
             //
             CheckThreatLevel(ThreatLevel.High, "osTeleportAgent");
 
-            ulong regionHandle = Util.UIntsToLong((regionX * (uint)Constants.RegionSize), (regionY * (uint)Constants.RegionSize));
+            ulong regionHandle = Util.UIntsToLong(((uint)regionX * (uint)Constants.RegionSize), ((uint)regionY * (uint)Constants.RegionSize));
 
             m_host.AddScriptLPS(1);
             UUID agentId = new UUID();
@@ -728,18 +728,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (target != null)
                 {
                     UUID animID=UUID.Zero;
-                    lock (m_host.TaskInventory)
+                    m_host.TaskInventory.LockItemsForRead(true);
+                    foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
                     {
-                        foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                        if (inv.Value.Name == animation)
                         {
-                            if (inv.Value.Name == animation)
-                            {
-                                if (inv.Value.Type == (int)AssetType.Animation)
-                                    animID = inv.Value.AssetID;
-                                continue;
-                            }
+                            if (inv.Value.Type == (int)AssetType.Animation)
+                                animID = inv.Value.AssetID;
+                            continue;
                         }
                     }
+                    m_host.TaskInventory.LockItemsForRead(false);
                     if (animID == UUID.Zero)
                         target.Animator.AddAnimation(animation, m_host.UUID);
                     else
@@ -761,18 +760,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (target != null)
                 {
                     UUID animID=UUID.Zero;
-                    lock (m_host.TaskInventory)
+                    m_host.TaskInventory.LockItemsForRead(true);
+                    foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
                     {
-                        foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                        if (inv.Value.Name == animation)
                         {
-                            if (inv.Value.Name == animation)
-                            {
-                                if (inv.Value.Type == (int)AssetType.Animation)
-                                    animID = inv.Value.AssetID;
-                                continue;
-                            }
+                            if (inv.Value.Type == (int)AssetType.Animation)
+                                animID = inv.Value.AssetID;
+                            continue;
                         }
                     }
+                    m_host.TaskInventory.LockItemsForRead(false);
                     
                     if (animID == UUID.Zero)
                         target.Animator.RemoveAnimation(animation);
@@ -1541,6 +1539,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (!UUID.TryParse(name, out assetID))
             {
+                m_host.TaskInventory.LockItemsForRead(true);
                 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
                 {
                     if (item.Type == 7 && item.Name == name)
@@ -1548,6 +1547,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         assetID = item.AssetID;
                     }
                 }
+                m_host.TaskInventory.LockItemsForRead(false);
             }
 
             if (assetID == UUID.Zero)
@@ -1594,6 +1594,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (!UUID.TryParse(name, out assetID))
             {
+                m_host.TaskInventory.LockItemsForRead(true);
                 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
                 {
                     if (item.Type == 7 && item.Name == name)
@@ -1601,6 +1602,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         assetID = item.AssetID;
                     }
                 }
+                m_host.TaskInventory.LockItemsForRead(false);
             }
 
             if (assetID == UUID.Zero)
@@ -1651,6 +1653,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (!UUID.TryParse(name, out assetID))
             {
+                m_host.TaskInventory.LockItemsForRead(true);
                 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
                 {
                     if (item.Type == 7 && item.Name == name)
@@ -1658,6 +1661,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         assetID = item.AssetID;
                     }
                 }
+                m_host.TaskInventory.LockItemsForRead(false);
             }
 
             if (assetID == UUID.Zero)
@@ -1948,5 +1952,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             return key.ToString();
         }
+                
+       /// <summary>
+        /// Return information regarding various simulator statistics (sim fps, physics fps, time
+        /// dilation, total number of prims, total number of active scripts, script lps, various
+        /// timing data, packets in/out, etc. Basically much the information that's shown in the
+        /// client's Statistics Bar (Ctrl-Shift-1)
+        /// </summary>
+        /// <returns>List of floats</returns>
+                public LSL_List osGetRegionStats()
+                {
+            CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats");
+            m_host.AddScriptLPS(1);
+            LSL_List ret = new LSL_List();
+                        float[] stats = World.SimulatorStats;
+                        
+                        for (int i = 0; i < 21; i++)
+                        {
+                                ret.Add(new LSL_Float( stats[i] ));
+                        }
+                        return ret;
+                }
+
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 2a403bf..0b0dc00 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
 
         // Teleport commands
         void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
-        void osTeleportAgent(string agent, uint regionX, uint regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
+        void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
         void osTeleportAgent(string agent, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
 
         // Animation commands
@@ -162,5 +162,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
 
         key osGetMapTexture();
         key osGetRegionMapTexture(string regionName);
+                LSL_List osGetRegionStats();
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
index 7f67599..15e0408 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics; //for [DebuggerNonUserCode]
 using System.Reflection;
 using System.Runtime.Remoting.Lifetime;
 using OpenSim.Region.ScriptEngine.Shared;
@@ -131,6 +132,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return (eventFlags);
         }
 
+        [DebuggerNonUserCode]
         public void ExecuteEvent(string state, string FunctionName, object[] args)
         {
             // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory.
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 753ca55..acff8fb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -515,6 +515,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const string TEXTURE_PLYWOOD = "89556747-24cb-43ed-920b-47caed15465f";
         public const string TEXTURE_TRANSPARENT = "8dcd4a48-2d37-4909-9f78-f7a9eb4ef903";
         public const string TEXTURE_MEDIA = "8b5fec65-8d8d-9dc5-cda8-8fdf2716e361";
+                
+                // Constants for osGetRegionStats
+                public const int STATS_TIME_DILATION = 0;
+                public const int STATS_SIM_FPS = 1;
+                public const int STATS_PHYSICS_FPS = 2;
+                public const int STATS_AGENT_UPDATES = 3;
+                public const int STATS_ROOT_AGENTS = 4;
+                public const int STATS_CHILD_AGENTS = 5;
+                public const int STATS_TOTAL_PRIMS = 6;
+                public const int STATS_ACTIVE_PRIMS = 7;
+                public const int STATS_FRAME_MS = 8;
+                public const int STATS_NET_MS = 9;
+                public const int STATS_PHYSICS_MS = 10;
+                public const int STATS_IMAGE_MS = 11;
+                public const int STATS_OTHER_MS = 12;
+                public const int STATS_IN_PACKETS_PER_SECOND = 13;
+                public const int STATS_OUT_PACKETS_PER_SECOND = 14;
+                public const int STATS_UNACKED_BYTES = 15;
+                public const int STATS_AGENT_MS = 16;
+                public const int STATS_PENDING_DOWNLOADS = 17;
+                public const int STATS_PENDING_UPLOADS = 18;
+                public const int STATS_ACTIVE_SCRIPTS = 19;
+                public const int STATS_SCRIPT_LPS = 20;
 
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 4928e90..519463e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -201,9 +201,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_OSSL_Functions.osTeleportAgent(agent, regionName, position, lookat);
         }
 
-        public void osTeleportAgent(string agent, long regionX, long regionY, vector position, vector lookat)
+        public void osTeleportAgent(string agent, int regionX, int regionY, vector position, vector lookat)
         {
-            m_OSSL_Functions.osTeleportAgent(agent, (uint) regionX, (uint) regionY, position, lookat);
+            m_OSSL_Functions.osTeleportAgent(agent, regionX, regionY, position, lookat);
         }
 
         public void osTeleportAgent(string agent, vector position, vector lookat)
@@ -632,5 +632,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             return m_OSSL_Functions.osGetRegionMapTexture(regionName);
         }
+                
+                public LSL_List osGetRegionStats()
+                {
+                        return m_OSSL_Functions.osGetRegionStats();
+                }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index 121159c..a44abb0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -33,6 +33,7 @@ using System.Threading;
 using System.Reflection;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics; //for [DebuggerNonUserCode]
 using OpenSim.Region.ScriptEngine.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Shared.Api.Runtime;
@@ -90,6 +91,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return (int)m_Executor.GetStateEventFlags(state);
         }
 
+        [DebuggerNonUserCode]
         public void ExecuteEvent(string state, string FunctionName, object[] args)
         {
             m_Executor.ExecuteEvent(state, FunctionName, args);