* 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

8 files changed, 13 insertions, 14 deletions

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);
         }
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index a06ed9b..15ce756 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3320,7 +3320,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 if (item.Name == name)
                 {
-                    m_host.RemoveInventoryItem(item.ItemID);
+                    m_host.Inventory.RemoveInventoryItem(item.ItemID);
                     return;
                 }
             }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index f46fdae..3d1fe3b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1032,7 +1032,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             taskItem.PermsMask = 0;
             taskItem.AssetID = asset.FullID;
 
-            m_host.AddInventoryItem(taskItem, false);
+            m_host.Inventory.AddInventoryItem(taskItem, false);
         }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 08f5491..983926f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -302,7 +302,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                     if (part.AttachmentPoint != 0) // Attached so ignore
                         continue;
 
-                    if (part.ContainsScripts())
+                    if (part.Inventory.ContainsScripts())
                     {
                         objtype |= ACTIVE | SCRIPTED; // Scripted and active. It COULD have one hidden ...
                     }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index 14266dd..a061fde 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -141,7 +141,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             foreach (SceneObjectPart p in part.ParentGroup.Children.Values)
             {
-                if (p.ContainsScripts())
+                if (p.Inventory.ContainsScripts())
                 {
                     Type |= 0x08; // Scripted
                     break;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 48463d1..ad86494 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -696,8 +696,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
             Stop(0);
             SceneObjectPart part=m_Engine.World.GetSceneObjectPart(m_LocalID);
-            part.GetInventoryItem(m_ItemID).PermsMask = 0;
-            part.GetInventoryItem(m_ItemID).PermsGranter = UUID.Zero;
+            part.Inventory.GetInventoryItem(m_ItemID).PermsMask = 0;
+            part.Inventory.GetInventoryItem(m_ItemID).PermsGranter = UUID.Zero;
             AsyncCommandManager.RemoveScript(m_Engine, m_LocalID, m_ItemID);
             m_EventQueue.Clear();
             m_Script.ResetVars();
@@ -721,8 +721,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
             m_Script.ResetVars();
             SceneObjectPart part=m_Engine.World.GetSceneObjectPart(m_LocalID);
-            part.GetInventoryItem(m_ItemID).PermsMask = 0;
-            part.GetInventoryItem(m_ItemID).PermsGranter = UUID.Zero;
+            part.Inventory.GetInventoryItem(m_ItemID).PermsMask = 0;
+            part.Inventory.GetInventoryItem(m_ItemID).PermsGranter = UUID.Zero;
             AsyncCommandManager.RemoveScript(m_Engine, m_LocalID, m_ItemID);
 
             m_EventQueue.Clear();
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 98d4f3b..0b19e85 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -366,7 +366,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                                     localID);
                          
                             TaskInventoryItem item =
-                                    part.GetInventoryItem(itemID);
+                                    part.Inventory.GetInventoryItem(itemID);
 
                             ScenePresence presence = 
                                     m_Scene.GetScenePresence(
@@ -464,7 +464,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 return false;
             }     
 
-            TaskInventoryItem item = part.GetInventoryItem(itemID);
+            TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID);
             if (item == null)
                 return false;