aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-21 21:16:42 +0000
committerJustin Clarke Casey2008-11-21 21:16:42 +0000
commit915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe (patch)
tree1f62bf777f73c4f3fffb2f5237cd7e5eaeddcb6f /OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
parent* Extend sog delete to inventory test to crank the normally async sog deleter... (diff)
downloadopensim-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/DotNetEngine/ScriptManager.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs5
1 files changed, 2 insertions, 3 deletions
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