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/Api | |
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/Api')
3 files changed, 3 insertions, 3 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 | } |