Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

6 files changed, 222 insertions, 271 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/ApiManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/ApiManager.cs
index 47ed6ba..684138f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/ApiManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/ApiManager.cs
@@ -29,42 +29,43 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
+using log4net;
 using OpenSim.Region.ScriptEngine.Interfaces;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Api
 {
     public class ApiManager
     {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private Dictionary<string,Type> m_Apis = new Dictionary<string,Type>();
 
         public string[] GetApis()
         {
-            if (m_Apis.Count > 0)
+            if (m_Apis.Count <= 0)
             {
-                List<string> l = new List<string>(m_Apis.Keys);
-                return l.ToArray();
-            }
+                Assembly a = Assembly.GetExecutingAssembly();
 
-            Assembly a = Assembly.GetExecutingAssembly();
+                Type[] types = a.GetExportedTypes();
 
-            Type[] types = a.GetExportedTypes();
-
-            foreach (Type t in types)
-            {
-                string name = t.ToString();
-                int idx = name.LastIndexOf('.');
-                if (idx != -1)
-                    name = name.Substring(idx+1);
-
-                if (name.EndsWith("_Api"))
+                foreach (Type t in types)
                 {
-                    name = name.Substring(0, name.Length - 4);
-                    m_Apis[name] = t;
+                    string name = t.ToString();
+                    int idx = name.LastIndexOf('.');
+                    if (idx != -1)
+                        name = name.Substring(idx+1);
+
+                    if (name.EndsWith("_Api"))
+                    {
+                        name = name.Substring(0, name.Length - 4);
+                        m_Apis[name] = t;
+                    }
                 }
             }
 
-            List<string> ret = new List<string>(m_Apis.Keys);
-            return ret.ToArray();
+//            m_log.DebugFormat("[API MANAGER]: Found {0} apis", m_Apis.Keys.Count);
+
+            return new List<string>(m_Apis.Keys).ToArray();
         }
 
         public IScriptApi CreateApi(string api)
@@ -76,4 +77,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return ret;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 36c9d5e..d4c872c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -85,7 +85,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         protected IScriptEngine m_ScriptEngine;
         protected SceneObjectPart m_host;
         protected uint m_localID;
+
+        /// <summary>
+        /// The UUID of the item that hosts this script
+        /// </summary>
         protected UUID m_itemID;
+
         protected bool throwErrorOnNotImplemented = true;
         protected AsyncCommandManager AsyncCommands = null;
         protected float m_ScriptDelayFactor = 1.0f;
@@ -267,23 +272,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        protected UUID InventorySelf()
+        /// <summary>
+        /// Get the inventory item that hosts ourselves.
+        /// </summary>
+        /// <remarks>
+        /// FIXME: It would be far easier to pass in TaskInventoryItem rather than just m_itemID so that we don't need
+        /// to keep looking ourselves up.
+        /// </remarks>
+        /// <returns></returns>
+        protected TaskInventoryItem GetSelfInventoryItem()
         {
-            UUID invItemID = new UUID();
-
             lock (m_host.TaskInventory)
-            {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
-                {
-                    if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID)
-                    {
-                        invItemID = inv.Key;
-                        break;
-                    }
-                }
-            }
-
-            return invItemID;
+                return m_host.TaskInventory[m_itemID];
         }
 
         protected UUID InventoryKey(string name, int type)
@@ -839,13 +839,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             m_host.AddScriptLPS(1);
 
+            if (channel == ScriptBaseClass.DEBUG_CHANNEL)
+            {
+                return;
+            }
+
             UUID TargetID;
             UUID.TryParse(target, out TargetID);
 
             IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
             if (wComm != null)
-                if (!wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg, out error))
-                    LSLError(error);
+                wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg);
         }
 
         public LSL_Integer llListen(int channelID, string name, string ID, string msg)
@@ -2697,18 +2701,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_Integer llGiveMoney(string destination, int amount)
         {
-            UUID invItemID=InventorySelf();
-            if (invItemID == UUID.Zero)
-                return 0;
-
             m_host.AddScriptLPS(1);
 
-            TaskInventoryItem item = m_host.TaskInventory[invItemID];
-
-            lock (m_host.TaskInventory)
-            {
-                item = m_host.TaskInventory[invItemID];
-            }
+            TaskInventoryItem item = GetSelfInventoryItem();
 
             if (item.PermsGranter == UUID.Zero)
                 return 0;
@@ -2951,15 +2946,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void llTakeControls(int controls, int accept, int pass_on)
         {
-            TaskInventoryItem item;
-
-            lock (m_host.TaskInventory)
-            {
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-                    return;
-                else
-                    item = m_host.TaskInventory[InventorySelf()];
-            }
+            TaskInventoryItem item = GetSelfInventoryItem();
 
             if (item.PermsGranter != UUID.Zero)
             {
@@ -2979,18 +2966,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void llReleaseControls()
         {
-            TaskInventoryItem item;
-
-            lock (m_host.TaskInventory)
-            {
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-                    return;
-                else
-                    item = m_host.TaskInventory[InventorySelf()];
-            }
-
             m_host.AddScriptLPS(1);
 
+            TaskInventoryItem item = GetSelfInventoryItem();
+
             if (item.PermsGranter != UUID.Zero)
             {
                 ScenePresence presence = World.GetScenePresence(item.PermsGranter);
@@ -3015,36 +2994,62 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 m_UrlModule.ReleaseURL(url);
         }
 
-        public void llAttachToAvatar(int attachment)
+        /// <summary>
+        /// Attach the object containing this script to the avatar that owns it.
+        /// </summary>
+        /// <param name='attachment'>The attachment point (e.g. ATTACH_CHEST)</param>
+        /// <returns>true if the attach suceeded, false if it did not</returns>
+        public bool AttachToAvatar(int attachmentPoint)
+        {
+            SceneObjectGroup grp = m_host.ParentGroup;
+            ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
+
+            IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
+
+            if (attachmentsModule != null)
+                return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false);
+            else
+                return false;
+        }
+
+        /// <summary>
+        /// Detach the object containing this script from the avatar it is attached to.
+        /// </summary>
+        /// <remarks>
+        /// Nothing happens if the object is not attached.
+        /// </remarks>
+        public void DetachFromAvatar()
+        {
+            Util.FireAndForget(DetachWrapper, m_host);
+        }
+
+        private void DetachWrapper(object o)
+        {
+            SceneObjectPart host = (SceneObjectPart)o;
+
+            SceneObjectGroup grp = host.ParentGroup;
+            UUID itemID = grp.FromItemID;
+            ScenePresence presence = World.GetScenePresence(host.OwnerID);
+
+            IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
+            if (attachmentsModule != null)
+                attachmentsModule.DetachSingleAttachmentToInv(presence, itemID);
+        }
+
+        public void llAttachToAvatar(int attachmentPoint)
         {
             m_host.AddScriptLPS(1);
 
 //            if (m_host.ParentGroup.RootPart.AttachmentPoint == 0)
 //                return;
 
-            TaskInventoryItem item;
-
-            lock (m_host.TaskInventory)
-            {
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-                    return;
-                else
-                    item = m_host.TaskInventory[InventorySelf()];
-            }
+            TaskInventoryItem item = GetSelfInventoryItem();
 
             if (item.PermsGranter != m_host.OwnerID)
                 return;
 
             if ((item.PermsMask & ScriptBaseClass.PERMISSION_ATTACH) != 0)
-            {
-                SceneObjectGroup grp = m_host.ParentGroup;
-
-                ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
-
-                IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
-                if (attachmentsModule != null)
-                    attachmentsModule.AttachObject(presence, grp, (uint)attachment, false);
-            }
+                AttachToAvatar(attachmentPoint);
         }
 
         public void llDetachFromAvatar()
@@ -3054,38 +3059,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (m_host.ParentGroup.AttachmentPoint == 0)
                 return;
 
-            TaskInventoryItem item;
-
-            lock (m_host.TaskInventory)
-            {
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-                    return;
-                else
-                    item = m_host.TaskInventory[InventorySelf()];
-            }
+            TaskInventoryItem item = GetSelfInventoryItem();
 
             if (item.PermsGranter != m_host.OwnerID)
                 return;
 
             if ((item.PermsMask & ScriptBaseClass.PERMISSION_ATTACH) != 0)
-            {
-                IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
-                if (attachmentsModule != null)
-                    Util.FireAndForget(DetachWrapper, m_host);
-            }
-        }
-
-        private void DetachWrapper(object o)
-        {
-            SceneObjectPart host = (SceneObjectPart)o;
-
-            SceneObjectGroup grp = host.ParentGroup;
-            UUID itemID = grp.FromItemID;
-            ScenePresence presence = World.GetScenePresence(host.OwnerID);
-
-            IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
-            if (attachmentsModule != null)
-                attachmentsModule.DetachSingleAttachmentToInv(presence, itemID);
+                DetachFromAvatar();
         }
 
         public void llTakeCamera(string avatar)
@@ -3313,19 +3293,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            UUID invItemID = InventorySelf();
-            if (invItemID == UUID.Zero)
-                return;
-
-            TaskInventoryItem item;
-
-            lock (m_host.TaskInventory)
-            {
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-                    return;
-                else
-                    item = m_host.TaskInventory[InventorySelf()];
-            }
+            TaskInventoryItem item = GetSelfInventoryItem();
 
             if (item.PermsGranter == UUID.Zero)
                 return;
@@ -3350,19 +3318,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            UUID invItemID=InventorySelf();
-            if (invItemID == UUID.Zero)
-                return;
-
-            TaskInventoryItem item;
-
-            lock (m_host.TaskInventory)
-            {
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-                    return;
-                else
-                    item = m_host.TaskInventory[InventorySelf()];
-            }
+            TaskInventoryItem item = GetSelfInventoryItem();
 
             if (item.PermsGranter == UUID.Zero)
                 return;
@@ -3417,22 +3373,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void llRequestPermissions(string agent, int perm)
         {
-            UUID agentID = new UUID();
+            UUID agentID;
 
             if (!UUID.TryParse(agent, out agentID))
                 return;
 
-            UUID invItemID = InventorySelf();
-
-            if (invItemID == UUID.Zero)
-                return; // Not in a prim? How??
-
-            TaskInventoryItem item;
-
-            lock (m_host.TaskInventory)
-            {
-                item = m_host.TaskInventory[invItemID];
-            }
+            TaskInventoryItem item = GetSelfInventoryItem();
 
             if (agentID == UUID.Zero || perm == 0) // Releasing permissions
             {
@@ -3466,8 +3412,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 {
                     lock (m_host.TaskInventory)
                     {
-                        m_host.TaskInventory[invItemID].PermsGranter = agentID;
-                        m_host.TaskInventory[invItemID].PermsMask = perm;
+                        m_host.TaskInventory[m_itemID].PermsGranter = agentID;
+                        m_host.TaskInventory[m_itemID].PermsMask = perm;
                     }
 
                     m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
@@ -3490,8 +3436,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 {
                     lock (m_host.TaskInventory)
                     {
-                        m_host.TaskInventory[invItemID].PermsGranter = agentID;
-                        m_host.TaskInventory[invItemID].PermsMask = perm;
+                        m_host.TaskInventory[m_itemID].PermsGranter = agentID;
+                        m_host.TaskInventory[m_itemID].PermsMask = perm;
                     }
 
                     m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
@@ -3515,8 +3461,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 {
                     lock (m_host.TaskInventory)
                     {
-                        m_host.TaskInventory[invItemID].PermsGranter = agentID;
-                        m_host.TaskInventory[invItemID].PermsMask = 0;
+                        m_host.TaskInventory[m_itemID].PermsGranter = agentID;
+                        m_host.TaskInventory[m_itemID].PermsMask = 0;
                     }
 
                     presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
@@ -3524,7 +3470,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
 
                 presence.ControllingClient.SendScriptQuestion(
-                    m_host.UUID, m_host.ParentGroup.RootPart.Name, ownerName, invItemID, perm);
+                    m_host.UUID, m_host.ParentGroup.RootPart.Name, ownerName, m_itemID, perm);
 
                 return;
             }
@@ -3541,20 +3487,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (taskID != m_host.UUID)
                 return;
 
-            UUID invItemID = InventorySelf();
-
-            if (invItemID == UUID.Zero)
-                return;
-
-            client.OnScriptAnswer-=handleScriptAnswer;
-            m_waitingForScriptAnswer=false;
+            client.OnScriptAnswer -= handleScriptAnswer;
+            m_waitingForScriptAnswer = false;
 
             if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
                 llReleaseControls();
 
             lock (m_host.TaskInventory)
             {
-                m_host.TaskInventory[invItemID].PermsMask = answer;
+                m_host.TaskInventory[m_itemID].PermsMask = answer;
             }
 
             m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
@@ -3567,39 +3508,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            lock (m_host.TaskInventory)
-            {
-                foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
-                {
-                    if (item.Type == 10 && item.ItemID == m_itemID)
-                    {
-                        return item.PermsGranter.ToString();
-                    }
-                }
-            }
-
-            return UUID.Zero.ToString();
+            return GetSelfInventoryItem().PermsGranter.ToString();
         }
 
         public LSL_Integer llGetPermissions()
         {
             m_host.AddScriptLPS(1);
 
-            lock (m_host.TaskInventory)
-            {
-                foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
-                {
-                    if (item.Type == 10 && item.ItemID == m_itemID)
-                    {
-                        int perms = item.PermsMask;
-                        if (m_automaticLinkPermission)
-                            perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
-                        return perms;
-                    }
-                }
-            }
+            int perms = GetSelfInventoryItem().PermsMask;
 
-            return 0;
+            if (m_automaticLinkPermission)
+                perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
+
+            return perms;
         }
 
         public LSL_Integer llGetLinkNumber()
@@ -3627,17 +3548,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llCreateLink(string target, int parent)
         {
             m_host.AddScriptLPS(1);
-            UUID invItemID = InventorySelf();
+
             UUID targetID;
 
             if (!UUID.TryParse(target, out targetID))
                 return;
 
-            TaskInventoryItem item;
-            lock (m_host.TaskInventory)
-            {
-                item = m_host.TaskInventory[invItemID];
-            }
+            TaskInventoryItem item = GetSelfInventoryItem();
 
             if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
                 && !m_automaticLinkPermission)
@@ -3688,16 +3605,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llBreakLink(int linknum)
         {
             m_host.AddScriptLPS(1);
-            UUID invItemID = InventorySelf();
 
-            lock (m_host.TaskInventory)
+            if ((GetSelfInventoryItem().PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
+                && !m_automaticLinkPermission)
             {
-                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!");
-                    return;
-                }
+                ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
+                return;
             }
 
             if (linknum < ScriptBaseClass.LINK_THIS)
@@ -4574,23 +4487,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_String llGetScriptName()
         {
-            string result = String.Empty;
-
             m_host.AddScriptLPS(1);
 
-            lock (m_host.TaskInventory)
-            {
-                foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
-                {
-                    if (item.Type == 10 && item.ItemID == m_itemID)
-                    {
-                        result = item.Name != null ? item.Name : String.Empty;
-                        break;
-                    }
-                }
-            }
+            TaskInventoryItem item = GetSelfInventoryItem();
 
-            return result;
+            return item.Name != null ? item.Name : String.Empty;
         }
 
         public LSL_Integer llGetLinkNumberOfSides(int link)
@@ -9691,21 +9592,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Vector llGetCameraPos()
         {
             m_host.AddScriptLPS(1);
-            UUID invItemID = InventorySelf();
 
-            if (invItemID == UUID.Zero)
-                return new LSL_Vector();
+            TaskInventoryItem item = GetSelfInventoryItem();
 
-            lock (m_host.TaskInventory)
-            {
-                if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
-                   return new LSL_Vector();
+            if (item.PermsGranter == UUID.Zero)
+               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 ((item.PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
+            {
+                ShoutError("No permissions to track the camera");
+                return new LSL_Vector();
             }
 
             ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
@@ -9720,20 +9616,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Rotation llGetCameraRot()
         {
             m_host.AddScriptLPS(1);
-            UUID invItemID = InventorySelf();
-            if (invItemID == UUID.Zero)
-                return new LSL_Rotation();
 
-            lock (m_host.TaskInventory)
-            {
-                if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
-                   return new LSL_Rotation();
+            TaskInventoryItem item = GetSelfInventoryItem();
 
-                if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
-                {
-                    ShoutError("No permissions to track the camera");
-                    return new LSL_Rotation();
-                }
+            if (item.PermsGranter == UUID.Zero)
+               return new LSL_Rotation();
+
+            if ((item.PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
+            {
+                ShoutError("No permissions to track the camera");
+                return new LSL_Rotation();
             }
 
             ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
@@ -9907,23 +9799,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            // our key in the object we are in
-            UUID invItemID = InventorySelf();
-            if (invItemID == UUID.Zero) return;
-
             // the object we are in
             UUID objectID = m_host.ParentUUID;
-            if (objectID == UUID.Zero) return;
+            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;
+            TaskInventoryItem item = GetSelfInventoryItem();
 
-                if (agentID == UUID.Zero) return;
-                if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
-            }
+            // we need the permission first, to know which avatar we want to set the camera for
+            UUID agentID = item.PermsGranter;
+
+            if (agentID == UUID.Zero)
+                return;
+
+            if ((item.PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
+                return;
 
             ScenePresence presence = World.GetScenePresence(agentID);
 
@@ -9963,27 +9853,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            // our key in the object we are in
-            UUID invItemID=InventorySelf();
-            if (invItemID == UUID.Zero) return;
-
             // the object we are in
             UUID objectID = m_host.ParentUUID;
-            if (objectID == UUID.Zero) return;
+            if (objectID == UUID.Zero)
+                return;
+
+            TaskInventoryItem item = GetSelfInventoryItem();
 
             // we need the permission first, to know which avatar we want to clear the camera for
-            UUID agentID;
-            lock (m_host.TaskInventory)
-            {
-                agentID = m_host.TaskInventory[invItemID].PermsGranter;
-                if (agentID == UUID.Zero) return;
-                if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
-            }
+            UUID agentID = item.PermsGranter;
+
+            if (agentID == UUID.Zero)
+                return;
+
+            if ((item.PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
+                return;
 
             ScenePresence presence = World.GetScenePresence(agentID);
 
             // we are not interested in child-agents
-            if (presence.IsChildAgent) return;
+            if (presence.IsChildAgent)
+                return;
 
             presence.ControllingClient.SendClearFollowCamProperties(objectID);
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index fe94b79..7fc7337 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -209,6 +209,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             throw new Exception("OSSL Runtime Error: " + msg);
         }
 
+        /// <summary>
+        /// Initialize the LSL interface.
+        /// </summary>
+        /// <remarks>
+        /// FIXME: This is an abomination.  We should be able to set this up earlier but currently we have no
+        /// guarantee the interface is present on Initialize().  There needs to be another post initialize call from
+        /// ScriptInstance.
+        /// </remarks>
         private void InitLSL()
         {
             if (m_LSL_Api != null)
@@ -1609,7 +1617,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public Object osParseJSONNew(string JSON)
         {
-            CheckThreatLevel(ThreatLevel.None, "osParseJSON");
+            CheckThreatLevel(ThreatLevel.None, "osParseJSONNew");
 
             m_host.AddScriptLPS(1);
 
@@ -3093,5 +3101,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     estate.setEstateTerrainTextureHeights(corner, (float)low, (float)high);
             }
         }
+
+        public void osForceAttachToAvatar(int attachmentPoint)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osForceAttachToAvatar");
+
+            m_host.AddScriptLPS(1);
+
+            InitLSL();
+            ((LSL_Api)m_LSL_Api).AttachToAvatar(attachmentPoint);
+        }
+
+        public void osForceDetachFromAvatar()
+        {
+            CheckThreatLevel(ThreatLevel.High, "osForceDetachFromAvatar");
+
+            m_host.AddScriptLPS(1);
+
+            InitLSL();
+            ((LSL_Api)m_LSL_Api).DetachFromAvatar();
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 545bbee..d0c852b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -98,6 +98,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void osAvatarPlayAnimation(string avatar, string animation);
         void osAvatarStopAnimation(string avatar, string animation);
 
+        // Attachment commands
+
+        /// <summary>
+        /// Attach the object containing this script to the avatar that owns it without checking for PERMISSION_ATTACH
+        /// </summary>
+        /// <param name='attachment'>The attachment point.  For example, ATTACH_CHEST</param>
+        void osForceAttachToAvatar(int attachment);
+
+        /// <summary>
+        /// Detach the object containing this script from the avatar it is attached to without checking for PERMISSION_ATTACH
+        /// </summary>
+        /// <remarks>Nothing happens if the object is not attached.</remarks>
+        void osForceDetachFromAvatar();
+
         //texture draw functions
         string osMovePen(string drawList, int x, int y);
         string osDrawLine(string drawList, int startX, int startY, int endX, int endY);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index b94b9bf..36ac0e3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -289,8 +289,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_OSSL_Functions.osAvatarStopAnimation(avatar, animation);
         }
 
+        // Avatar functions
 
-        //Texture Draw functions
+        public void osForceAttachToAvatar(int attachmentPoint)
+        {
+            m_OSSL_Functions.osForceAttachToAvatar(attachmentPoint);
+        }
+
+        public void osForceDetachFromAvatar()
+        {
+            m_OSSL_Functions.osForceDetachFromAvatar();
+        }
+
+        // Texture Draw functions
 
         public string osMovePen(string drawList, int x, int y)
         {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 6e36742..2c8af81 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -964,7 +964,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         public IScriptApi GetApi(string name)
         {
             if (m_Apis.ContainsKey(name))
+            {
+//                m_log.DebugFormat("[SCRIPT INSTANCE]: Found api {0} in {1}@{2}", name, ScriptName, PrimName);
+
                 return m_Apis[name];
+            }
+
+//            m_log.DebugFormat("[SCRIPT INSTANCE]: Did not find api {0} in {1}@{2}", name, ScriptName, PrimName);
+
             return null;
         }