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/DotNetEngine | |
parent | * Extend sog delete to inventory test to crank the normally async sog deleter... (diff) | |
download | opensim-SC-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.zip opensim-SC-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.tar.gz opensim-SC-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.tar.bz2 opensim-SC-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/DotNetEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 5 |
2 files changed, 3 insertions, 4 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 | |||
268 | localID); | 268 | localID); |
269 | 269 | ||
270 | TaskInventoryItem item = | 270 | TaskInventoryItem item = |
271 | part.GetInventoryItem(itemID); | 271 | part.Inventory.GetInventoryItem(itemID); |
272 | 272 | ||
273 | ScenePresence presence = | 273 | ScenePresence presence = |
274 | myScriptEngine.World.GetScenePresence( | 274 | 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 | |||
570 | 570 | ||
571 | #endregion | 571 | #endregion |
572 | 572 | ||
573 | |||
574 | public void ResetScript(uint localID, UUID itemID) | 573 | public void ResetScript(uint localID, UUID itemID) |
575 | { | 574 | { |
576 | InstanceData id = GetScript(localID, itemID); | 575 | InstanceData id = GetScript(localID, itemID); |
577 | string script = id.Source; | 576 | string script = id.Source; |
578 | StopScript(localID, itemID); | 577 | StopScript(localID, itemID); |
579 | SceneObjectPart part = World.GetSceneObjectPart(localID); | 578 | SceneObjectPart part = World.GetSceneObjectPart(localID); |
580 | part.GetInventoryItem(itemID).PermsMask = 0; | 579 | part.Inventory.GetInventoryItem(itemID).PermsMask = 0; |
581 | part.GetInventoryItem(itemID).PermsGranter = UUID.Zero; | 580 | part.Inventory.GetInventoryItem(itemID).PermsGranter = UUID.Zero; |
582 | StartScript(localID, itemID, script, id.StartParam, false); | 581 | StartScript(localID, itemID, script, id.StartParam, false); |
583 | } | 582 | } |
584 | 583 | ||