From 915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 21 Nov 2008 21:16:42 +0000
Subject: * refactor: Rip out SOP inventory from the partial into a separate
 class * SceneObjectPartInventory.cs isn't a particularly good name but it's
 probably not got a long life * A proper inventory interface to follow *
 Parallel changes for other inventory partial classes to follow at a later
 date

---
 OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs  | 2 +-
 OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/DotNetEngine')

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
index d1dbf94..72766a4 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
@@ -268,7 +268,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                                     localID);
 
                             TaskInventoryItem item =
-                                    part.GetInventoryItem(itemID);
+                                    part.Inventory.GetInventoryItem(itemID);
 
                             ScenePresence presence =
                                     myScriptEngine.World.GetScenePresence(
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index fc6024a..bd60759 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -570,15 +570,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
 
         #endregion
 
-
         public void ResetScript(uint localID, UUID itemID)
         {
             InstanceData id = GetScript(localID, itemID);
             string script = id.Source;
             StopScript(localID, itemID);
             SceneObjectPart part = World.GetSceneObjectPart(localID);
-            part.GetInventoryItem(itemID).PermsMask = 0;
-            part.GetInventoryItem(itemID).PermsGranter = UUID.Zero;
+            part.Inventory.GetInventoryItem(itemID).PermsMask = 0;
+            part.Inventory.GetInventoryItem(itemID).PermsGranter = UUID.Zero;
             StartScript(localID, itemID, script, id.StartParam, false);
         }
 
-- 
cgit v1.1