OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fix plus some cleanup

0.9.0-post-fixes
UbitUmarov 2017-06-09 00:15:53 +01:00
parent ef2fd8fcea
commit 1e3a19e673
1 changed files with 65 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@ -91,7 +91,8 @@ namespace OpenSim.Region.Framework.Scenes
/// </value> /// </value>
protected internal TaskInventoryDictionary Items protected internal TaskInventoryDictionary Items
{ {
get { get
{
return m_items; return m_items;
} }
set set
@ -141,45 +142,53 @@ namespace OpenSim.Region.Framework.Scenes
/// </remarks> /// </remarks>
public void ResetInventoryIDs() public void ResetInventoryIDs()
{ {
if (null == m_part) if (m_part == null)
m_items.LockItemsForWrite(true); return;
if (Items.Count == 0) m_items.LockItemsForWrite(true);
if (m_items.Count == 0)
{ {
m_items.LockItemsForWrite(false); m_items.LockItemsForWrite(false);
return; return;
} }
IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); UUID partID = m_part.UUID;
Items.Clear(); IList<TaskInventoryItem> items = new List<TaskInventoryItem>(m_items.Values);
m_items.Clear();
foreach (TaskInventoryItem item in items) foreach (TaskInventoryItem item in items)
{ {
item.ResetIDs(m_part.UUID); item.ResetIDs(partID);
Items.Add(item.ItemID, item); m_items.Add(item.ItemID, item);
} }
m_inventorySerial++;
m_items.LockItemsForWrite(false); m_items.LockItemsForWrite(false);
} }
public void ResetObjectID() public void ResetObjectID()
{ {
if (m_part == null)
return;
m_items.LockItemsForWrite(true); m_items.LockItemsForWrite(true);
if (Items.Count == 0) if (m_items.Count == 0)
{ {
m_items.LockItemsForWrite(false); m_items.LockItemsForWrite(false);
return; return;
} }
IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); IList<TaskInventoryItem> items = new List<TaskInventoryItem>(m_items.Values);
Items.Clear(); m_items.Clear();
UUID partID = m_part.UUID;
foreach (TaskInventoryItem item in items) foreach (TaskInventoryItem item in items)
{ {
item.ParentPartID = m_part.UUID; item.ParentPartID = partID;
item.ParentID = m_part.UUID; item.ParentID = partID;
Items.Add(item.ItemID, item); m_items.Add(item.ItemID, item);
} }
m_inventorySerial++;
m_items.LockItemsForWrite(false); m_items.LockItemsForWrite(false);
} }
@ -189,15 +198,17 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="ownerId"></param> /// <param name="ownerId"></param>
public void ChangeInventoryOwner(UUID ownerId) public void ChangeInventoryOwner(UUID ownerId)
{ {
List<TaskInventoryItem> items = GetInventoryItems(); if(m_part == null)
if (items.Count == 0)
return; return;
m_items.LockItemsForWrite(true); m_items.LockItemsForWrite(true);
HasInventoryChanged = true; if (m_items.Count == 0)
m_part.ParentGroup.HasGroupChanged = true; {
foreach (TaskInventoryItem item in items) m_items.LockItemsForWrite(false);
return;
}
foreach (TaskInventoryItem item in m_items.Values)
{ {
if (ownerId != item.OwnerID) if (ownerId != item.OwnerID)
item.LastOwnerID = item.OwnerID; item.LastOwnerID = item.OwnerID;
@ -207,6 +218,8 @@ namespace OpenSim.Region.Framework.Scenes
item.PermsGranter = UUID.Zero; item.PermsGranter = UUID.Zero;
item.OwnerChanged = true; item.OwnerChanged = true;
} }
HasInventoryChanged = true;
m_part.ParentGroup.HasGroupChanged = true;
m_inventorySerial++; m_inventorySerial++;
m_items.LockItemsForWrite(false); m_items.LockItemsForWrite(false);
} }
@ -217,8 +230,11 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="groupID"></param> /// <param name="groupID"></param>
public void ChangeInventoryGroup(UUID groupID) public void ChangeInventoryGroup(UUID groupID)
{ {
if(m_part == null)
return;
m_items.LockItemsForWrite(true); m_items.LockItemsForWrite(true);
if (0 == Items.Count) if (m_items.Count == 0)
{ {
m_items.LockItemsForWrite(false); m_items.LockItemsForWrite(false);
return; return;
@ -233,11 +249,9 @@ namespace OpenSim.Region.Framework.Scenes
m_part.ParentGroup.HasGroupChanged = true; m_part.ParentGroup.HasGroupChanged = true;
} }
IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); foreach (TaskInventoryItem item in m_items.Values)
foreach (TaskInventoryItem item in items)
{
item.GroupID = groupID; item.GroupID = groupID;
}
m_items.LockItemsForWrite(false); m_items.LockItemsForWrite(false);
} }
@ -246,8 +260,8 @@ namespace OpenSim.Region.Framework.Scenes
if (m_part == null || m_part.ParentGroup == null || m_part.ParentGroup.Scene == null) if (m_part == null || m_part.ParentGroup == null || m_part.ParentGroup.Scene == null)
return; return;
Items.LockItemsForRead(true); m_items.LockItemsForRead(true);
foreach (TaskInventoryItem item in Items.Values) foreach (TaskInventoryItem item in m_items.Values)
{ {
if (item.InvType == (int)InventoryType.LSL) if (item.InvType == (int)InventoryType.LSL)
{ {
@ -257,7 +271,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
Items.LockItemsForRead(false); m_items.LockItemsForRead(false);
} }
public bool TryGetScriptInstanceRunning(UUID itemId, out bool running) public bool TryGetScriptInstanceRunning(UUID itemId, out bool running)
@ -345,7 +359,9 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
public void StopScriptInstances() public void StopScriptInstances()
{ {
GetInventoryItems(InventoryType.LSL).ForEach(i => StopScriptInstance(i)); List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
foreach (TaskInventoryItem item in scripts)
StopScriptInstance(item);
} }
/// <summary> /// <summary>
@ -807,7 +823,6 @@ namespace OpenSim.Region.Framework.Scenes
m_part.AggregateInnerPerms(); m_part.AggregateInnerPerms();
m_inventorySerial++; m_inventorySerial++;
//m_inventorySerial += 2;
HasInventoryChanged = true; HasInventoryChanged = true;
m_part.ParentGroup.HasGroupChanged = true; m_part.ParentGroup.HasGroupChanged = true;
} }
@ -1126,18 +1141,18 @@ namespace OpenSim.Region.Framework.Scenes
{ {
bool changed = false; bool changed = false;
Items.LockItemsForRead(true); m_items.LockItemsForRead(true);
if (m_inventorySerial == 0) // No inventory if (m_inventorySerial == 0) // No inventory
{ {
Items.LockItemsForRead(false); m_items.LockItemsForRead(false);
client.SendTaskInventory(m_part.UUID, 0, new byte[0]); client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
return; return;
} }
if (m_items.Count == 0) // No inventory if (m_items.Count == 0) // No inventory
{ {
Items.LockItemsForRead(false); m_items.LockItemsForRead(false);
client.SendTaskInventory(m_part.UUID, 0, new byte[0]); client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
return; return;
} }
@ -1148,7 +1163,7 @@ namespace OpenSim.Region.Framework.Scenes
changed = true; changed = true;
} }
Items.LockItemsForRead(false); m_items.LockItemsForRead(false);
if (m_inventoryFileData.Length < 2) if (m_inventoryFileData.Length < 2)
changed = true; changed = true;
@ -1173,7 +1188,7 @@ namespace OpenSim.Region.Framework.Scenes
InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero); InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero);
Items.LockItemsForRead(true); m_items.LockItemsForRead(true);
foreach (TaskInventoryItem item in m_items.Values) foreach (TaskInventoryItem item in m_items.Values)
{ {
@ -1234,7 +1249,7 @@ namespace OpenSim.Region.Framework.Scenes
invString.AddSectionEnd(); invString.AddSectionEnd();
} }
Items.LockItemsForRead(false); m_items.LockItemsForRead(false);
m_inventoryFileData = Utils.StringToBytes(invString.GetString()); m_inventoryFileData = Utils.StringToBytes(invString.GetString());
@ -1264,10 +1279,10 @@ namespace OpenSim.Region.Framework.Scenes
// of prim inventory loss. // of prim inventory loss.
// if (HasInventoryChanged) // if (HasInventoryChanged)
// { // {
Items.LockItemsForRead(true); m_items.LockItemsForRead(true);
ICollection<TaskInventoryItem> itemsvalues = Items.Values; ICollection<TaskInventoryItem> itemsvalues = m_items.Values;
HasInventoryChanged = false; HasInventoryChanged = false;
Items.LockItemsForRead(false); m_items.LockItemsForRead(false);
try try
{ {
datastore.StorePrimInventory(m_part.UUID, itemsvalues); datastore.StorePrimInventory(m_part.UUID, itemsvalues);
@ -1434,15 +1449,13 @@ namespace OpenSim.Region.Framework.Scenes
public int ScriptCount() public int ScriptCount()
{ {
int count = 0; int count = 0;
Items.LockItemsForRead(true); m_items.LockItemsForRead(true);
foreach (TaskInventoryItem item in m_items.Values) foreach (TaskInventoryItem item in m_items.Values)
{ {
if (item.InvType == (int)InventoryType.LSL) if (item.InvType == (int)InventoryType.LSL)
{
count++; count++;
} }
} m_items.LockItemsForRead(false);
Items.LockItemsForRead(false);
return count; return count;
} }
/// <summary> /// <summary>
@ -1465,48 +1478,44 @@ namespace OpenSim.Region.Framework.Scenes
if (engine != null) if (engine != null)
{ {
if (engine.GetScriptState(item.ItemID)) if (engine.GetScriptState(item.ItemID))
{
count++; count++;
} }
} }
} }
}
return count; return count;
} }
public List<UUID> GetInventoryList() public List<UUID> GetInventoryList()
{ {
List<UUID> ret = new List<UUID>(); m_items.LockItemsForRead(true);
List<UUID> ret = new List<UUID>(m_items.Count);
foreach (TaskInventoryItem item in m_items.Values) foreach (TaskInventoryItem item in m_items.Values)
ret.Add(item.ItemID); ret.Add(item.ItemID);
m_items.LockItemsForRead(false);
return ret; return ret;
} }
public List<TaskInventoryItem> GetInventoryItems() public List<TaskInventoryItem> GetInventoryItems()
{ {
List<TaskInventoryItem> ret = new List<TaskInventoryItem>(); m_items.LockItemsForRead(true);
List<TaskInventoryItem> ret = new List<TaskInventoryItem>(m_items.Values);
Items.LockItemsForRead(true); m_items.LockItemsForRead(false);
ret = new List<TaskInventoryItem>(m_items.Values);
Items.LockItemsForRead(false);
return ret; return ret;
} }
public List<TaskInventoryItem> GetInventoryItems(InventoryType type) public List<TaskInventoryItem> GetInventoryItems(InventoryType type)
{ {
List<TaskInventoryItem> ret = new List<TaskInventoryItem>(); m_items.LockItemsForRead(true);
Items.LockItemsForRead(true);
List<TaskInventoryItem> ret = new List<TaskInventoryItem>(m_items.Count);
foreach (TaskInventoryItem item in m_items.Values) foreach (TaskInventoryItem item in m_items.Values)
if (item.InvType == (int)type) if (item.InvType == (int)type)
ret.Add(item); ret.Add(item);
Items.LockItemsForRead(false); m_items.LockItemsForRead(false);
return ret; return ret;
} }