aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
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
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 '')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Helpers.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs4
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
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
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
3320 { 3320 {
3321 if (item.Name == name) 3321 if (item.Name == name)
3322 { 3322 {
3323 m_host.RemoveInventoryItem(item.ItemID); 3323 m_host.Inventory.RemoveInventoryItem(item.ItemID);
3324 return; 3324 return;
3325 } 3325 }
3326 } 3326 }
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
1032 taskItem.PermsMask = 0; 1032 taskItem.PermsMask = 0;
1033 taskItem.AssetID = asset.FullID; 1033 taskItem.AssetID = asset.FullID;
1034 1034
1035 m_host.AddInventoryItem(taskItem, false); 1035 m_host.Inventory.AddInventoryItem(taskItem, false);
1036 } 1036 }
1037 } 1037 }
1038} 1038}
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
302 if (part.AttachmentPoint != 0) // Attached so ignore 302 if (part.AttachmentPoint != 0) // Attached so ignore
303 continue; 303 continue;
304 304
305 if (part.ContainsScripts()) 305 if (part.Inventory.ContainsScripts())
306 { 306 {
307 objtype |= ACTIVE | SCRIPTED; // Scripted and active. It COULD have one hidden ... 307 objtype |= ACTIVE | SCRIPTED; // Scripted and active. It COULD have one hidden ...
308 } 308 }
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
141 141
142 foreach (SceneObjectPart p in part.ParentGroup.Children.Values) 142 foreach (SceneObjectPart p in part.ParentGroup.Children.Values)
143 { 143 {
144 if (p.ContainsScripts()) 144 if (p.Inventory.ContainsScripts())
145 { 145 {
146 Type |= 0x08; // Scripted 146 Type |= 0x08; // Scripted
147 break; 147 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
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();
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
366 localID); 366 localID);
367 367
368 TaskInventoryItem item = 368 TaskInventoryItem item =
369 part.GetInventoryItem(itemID); 369 part.Inventory.GetInventoryItem(itemID);
370 370
371 ScenePresence presence = 371 ScenePresence presence =
372 m_Scene.GetScenePresence( 372 m_Scene.GetScenePresence(
@@ -464,7 +464,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
464 return false; 464 return false;
465 } 465 }
466 466
467 TaskInventoryItem item = part.GetInventoryItem(itemID); 467 TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID);
468 if (item == null) 468 if (item == null)
469 return false; 469 return false;
470 470