diff options
| author | Justin Clarke Casey | 2008-11-21 21:16:42 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-11-21 21:16:42 +0000 |
| commit | 915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe (patch) | |
| tree | 1f62bf777f73c4f3fffb2f5237cd7e5eaeddcb6f /OpenSim/Region/ScriptEngine/Shared/Instance | |
| parent | * Extend sog delete to inventory test to crank the normally async sog deleter... (diff) | |
| download | opensim-SC_OLD-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.zip opensim-SC_OLD-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.tar.gz opensim-SC_OLD-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.tar.bz2 opensim-SC_OLD-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.tar.xz | |
* 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
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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 | |||
| 696 | 696 | ||
| 697 | Stop(0); | 697 | Stop(0); |
| 698 | SceneObjectPart part=m_Engine.World.GetSceneObjectPart(m_LocalID); | 698 | SceneObjectPart part=m_Engine.World.GetSceneObjectPart(m_LocalID); |
| 699 | part.GetInventoryItem(m_ItemID).PermsMask = 0; | 699 | part.Inventory.GetInventoryItem(m_ItemID).PermsMask = 0; |
| 700 | part.GetInventoryItem(m_ItemID).PermsGranter = UUID.Zero; | 700 | part.Inventory.GetInventoryItem(m_ItemID).PermsGranter = UUID.Zero; |
| 701 | AsyncCommandManager.RemoveScript(m_Engine, m_LocalID, m_ItemID); | 701 | AsyncCommandManager.RemoveScript(m_Engine, m_LocalID, m_ItemID); |
| 702 | m_EventQueue.Clear(); | 702 | m_EventQueue.Clear(); |
| 703 | m_Script.ResetVars(); | 703 | m_Script.ResetVars(); |
| @@ -721,8 +721,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 721 | 721 | ||
| 722 | m_Script.ResetVars(); | 722 | m_Script.ResetVars(); |
| 723 | SceneObjectPart part=m_Engine.World.GetSceneObjectPart(m_LocalID); | 723 | SceneObjectPart part=m_Engine.World.GetSceneObjectPart(m_LocalID); |
| 724 | part.GetInventoryItem(m_ItemID).PermsMask = 0; | 724 | part.Inventory.GetInventoryItem(m_ItemID).PermsMask = 0; |
| 725 | part.GetInventoryItem(m_ItemID).PermsGranter = UUID.Zero; | 725 | part.Inventory.GetInventoryItem(m_ItemID).PermsGranter = UUID.Zero; |
| 726 | AsyncCommandManager.RemoveScript(m_Engine, m_LocalID, m_ItemID); | 726 | AsyncCommandManager.RemoveScript(m_Engine, m_LocalID, m_ItemID); |
| 727 | 727 | ||
| 728 | m_EventQueue.Clear(); | 728 | m_EventQueue.Clear(); |