ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-19 22:45:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

* refactor: Rip out SOP inventory from the partial into a separate class

Browse Source 
* 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
This commit is contained in:
Justin Clarke Casey
2008-11-21 21:16:42 +00:00
parent 02105c9c2a
commit 915593bfbc
23 changed files with 252 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
View File

@@ -268,7 +268,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
localID);
TaskInventoryItem item =
part.GetInventoryItem(itemID);
part.Inventory.GetInventoryItem(itemID);
ScenePresence presence =
myScriptEngine.World.GetScenePresence(

5
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
View File

@@ -570,15 +570,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
#endregion
public void ResetScript(uint localID, UUID itemID)
{
InstanceData id = GetScript(localID, itemID);
string script = id.Source;
StopScript(localID, itemID);
SceneObjectPart part = World.GetSceneObjectPart(localID);
part.GetInventoryItem(itemID).PermsMask = 0;
part.GetInventoryItem(itemID).PermsGranter = UUID.Zero;
part.Inventory.GetInventoryItem(itemID).PermsMask = 0;
part.Inventory.GetInventoryItem(itemID).PermsGranter = UUID.Zero;
StartScript(localID, itemID, script, id.StartParam, false);
}

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -3320,7 +3320,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
if (item.Name == name)
{
m_host.RemoveInventoryItem(item.ItemID);
m_host.Inventory.RemoveInventoryItem(item.ItemID);
return;
}
}

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -1032,7 +1032,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
taskItem.PermsMask = 0;
taskItem.AssetID = asset.FullID;
m_host.AddInventoryItem(taskItem, false);
m_host.Inventory.AddInventoryItem(taskItem, false);
}
}
}

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
View File

@@ -302,7 +302,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
if (part.AttachmentPoint != 0) // Attached so ignore
continue;
if (part.ContainsScripts())
if (part.Inventory.ContainsScripts())
{
objtype |= ACTIVE | SCRIPTED; // Scripted and active. It COULD have one hidden ...
}

2
OpenSim/Region/ScriptEngine/Shared/Helpers.cs
View File

@@ -141,7 +141,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
foreach (SceneObjectPart p in part.ParentGroup.Children.Values)
{
if (p.ContainsScripts())
if (p.Inventory.ContainsScripts())
{
Type |= 0x08; // Scripted
break;

8
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@@ -696,8 +696,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
Stop(0);
SceneObjectPart part=m_Engine.World.GetSceneObjectPart(m_LocalID);
part.GetInventoryItem(m_ItemID).PermsMask = 0;
part.GetInventoryItem(m_ItemID).PermsGranter = UUID.Zero;
part.Inventory.GetInventoryItem(m_ItemID).PermsMask = 0;
part.Inventory.GetInventoryItem(m_ItemID).PermsGranter = UUID.Zero;
AsyncCommandManager.RemoveScript(m_Engine, m_LocalID, m_ItemID);
m_EventQueue.Clear();
m_Script.ResetVars();
@@ -721,8 +721,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
m_Script.ResetVars();
SceneObjectPart part=m_Engine.World.GetSceneObjectPart(m_LocalID);
part.GetInventoryItem(m_ItemID).PermsMask = 0;
part.GetInventoryItem(m_ItemID).PermsGranter = UUID.Zero;
part.Inventory.GetInventoryItem(m_ItemID).PermsMask = 0;
part.Inventory.GetInventoryItem(m_ItemID).PermsGranter = UUID.Zero;
AsyncCommandManager.RemoveScript(m_Engine, m_LocalID, m_ItemID);
m_EventQueue.Clear();

4
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@@ -366,7 +366,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
localID);
TaskInventoryItem item =
part.GetInventoryItem(itemID);
part.Inventory.GetInventoryItem(itemID);
ScenePresence presence =
m_Scene.GetScenePresence(
@@ -464,7 +464,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return false;
}
TaskInventoryItem item = part.GetInventoryItem(itemID);
TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID);
if (item == null)
return false;