aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-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
5 files changed, 8 insertions, 8 deletions
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();