1 files changed, 42 insertions, 94 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 36c9d5e..6000293 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,25 +272,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        protected UUID InventorySelf()
-        {
-            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;
-        }
-
         protected UUID InventoryKey(string name, int type)
         {
             m_host.AddScriptLPS(1);
@@ -2697,17 +2683,13 @@ 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];
+            TaskInventoryItem item;
 
             lock (m_host.TaskInventory)
             {
-                item = m_host.TaskInventory[invItemID];
+                item = m_host.TaskInventory[m_itemID];
             }
 
             if (item.PermsGranter == UUID.Zero)
@@ -2955,10 +2937,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             lock (m_host.TaskInventory)
             {
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
+                if (!m_host.TaskInventory.ContainsKey(m_itemID))
                     return;
                 else
-                    item = m_host.TaskInventory[InventorySelf()];
+                    item = m_host.TaskInventory[m_itemID];
             }
 
             if (item.PermsGranter != UUID.Zero)
@@ -2983,10 +2965,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             lock (m_host.TaskInventory)
             {
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
+                if (!m_host.TaskInventory.ContainsKey(m_itemID))
                     return;
                 else
-                    item = m_host.TaskInventory[InventorySelf()];
+                    item = m_host.TaskInventory[m_itemID];
             }
 
             m_host.AddScriptLPS(1);
@@ -3026,10 +3008,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             lock (m_host.TaskInventory)
             {
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
+                if (!m_host.TaskInventory.ContainsKey(m_itemID))
                     return;
                 else
-                    item = m_host.TaskInventory[InventorySelf()];
+                    item = m_host.TaskInventory[m_itemID];
             }
 
             if (item.PermsGranter != m_host.OwnerID)
@@ -3058,10 +3040,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             lock (m_host.TaskInventory)
             {
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
+                if (!m_host.TaskInventory.ContainsKey(m_itemID))
                     return;
                 else
-                    item = m_host.TaskInventory[InventorySelf()];
+                    item = m_host.TaskInventory[m_itemID];
             }
 
             if (item.PermsGranter != m_host.OwnerID)
@@ -3313,18 +3295,14 @@ 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()))
+                if (!m_host.TaskInventory.ContainsKey(m_itemID))
                     return;
                 else
-                    item = m_host.TaskInventory[InventorySelf()];
+                    item = m_host.TaskInventory[m_itemID];
             }
 
             if (item.PermsGranter == UUID.Zero)
@@ -3350,18 +3328,14 @@ 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()))
+                if (!m_host.TaskInventory.ContainsKey(m_itemID))
                     return;
                 else
-                    item = m_host.TaskInventory[InventorySelf()];
+                    item = m_host.TaskInventory[m_itemID];
             }
 
             if (item.PermsGranter == UUID.Zero)
@@ -3417,21 +3391,16 @@ 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];
+                item = m_host.TaskInventory[m_itemID];
             }
 
             if (agentID == UUID.Zero || perm == 0) // Releasing permissions
@@ -3466,8 +3435,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 +3459,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 +3484,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 +3493,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 +3510,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(
@@ -3627,7 +3591,7 @@ 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))
@@ -3636,7 +3600,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             TaskInventoryItem item;
             lock (m_host.TaskInventory)
             {
-                item = m_host.TaskInventory[invItemID];
+                item = m_host.TaskInventory[m_itemID];
             }
 
             if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
@@ -3688,11 +3652,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llBreakLink(int linknum)
         {
             m_host.AddScriptLPS(1);
-            UUID invItemID = InventorySelf();
 
             lock (m_host.TaskInventory)
             {
-                if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
+                if ((m_host.TaskInventory[m_itemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
                     && !m_automaticLinkPermission)
                 {
                     ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
@@ -9691,17 +9654,13 @@ 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();
 
             lock (m_host.TaskInventory)
             {
-                if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
+                if (m_host.TaskInventory[m_itemID].PermsGranter == UUID.Zero)
                    return new LSL_Vector();
 
-                if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
+                if ((m_host.TaskInventory[m_itemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
                 {
                     ShoutError("No permissions to track the camera");
                     return new LSL_Vector();
@@ -9720,16 +9679,13 @@ 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)
+                if (m_host.TaskInventory[m_itemID].PermsGranter == UUID.Zero)
                    return new LSL_Rotation();
 
-                if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
+                if ((m_host.TaskInventory[m_itemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
                 {
                     ShoutError("No permissions to track the camera");
                     return new LSL_Rotation();
@@ -9907,10 +9863,6 @@ 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;
@@ -9919,10 +9871,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             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;
+                agentID = m_host.TaskInventory[m_itemID].PermsGranter;
 
                 if (agentID == UUID.Zero) return;
-                if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
+                if ((m_host.TaskInventory[m_itemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
             }
 
             ScenePresence presence = World.GetScenePresence(agentID);
@@ -9963,10 +9915,6 @@ 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;
@@ -9975,9 +9923,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID agentID;
             lock (m_host.TaskInventory)
             {
-                agentID = m_host.TaskInventory[invItemID].PermsGranter;
+                agentID = m_host.TaskInventory[m_itemID].PermsGranter;
                 if (agentID == UUID.Zero) return;
-                if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
+                if ((m_host.TaskInventory[m_itemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
             }
 
             ScenePresence presence = World.GetScenePresence(agentID);