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

Make scripted attachment states work. Finally. Also replace two monitor locks 

with RWLocks, hunting the 10^3 bug. Not successful, but needed to be done anyway
avinationmerge
Melanie Thielker 2010-04-25 22:03:35 +02:00
parent 899d521ab4
commit 81ff5eaba0
3 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
View File

@ -215,5 +215,6 @@ namespace OpenSim.Region.Framework.Interfaces
/// A <see cref="Dictionary`2"/> /// A <see cref="Dictionary`2"/>
/// </returns> /// </returns>
Dictionary<UUID, string> GetScriptStates(); Dictionary<UUID, string> GetScriptStates();
Dictionary<UUID, string> GetScriptStates(bool oldIDs);
} }
} }

7
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -1040,6 +1040,11 @@ namespace OpenSim.Region.Framework.Scenes
#endregion #endregion
public void SaveScriptedState(XmlTextWriter writer) public void SaveScriptedState(XmlTextWriter writer)
{
SaveScriptedState(writer, false);
}
public void SaveScriptedState(XmlTextWriter writer, bool oldIDs)
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
Dictionary<UUID,string> states = new Dictionary<UUID,string>(); Dictionary<UUID,string> states = new Dictionary<UUID,string>();
@ -1050,7 +1055,7 @@ namespace OpenSim.Region.Framework.Scenes
foreach (SceneObjectPart part in m_parts.Values) foreach (SceneObjectPart part in m_parts.Values)
{ {
Dictionary<UUID,string> pstates = part.Inventory.GetScriptStates(); Dictionary<UUID,string> pstates = part.Inventory.GetScriptStates(oldIDs);
foreach (UUID itemid in pstates.Keys) foreach (UUID itemid in pstates.Keys)
{ {
states.Add(itemid, pstates[itemid]); states.Add(itemid, pstates[itemid]);

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

@ -311,11 +311,12 @@ namespace OpenSim.Region.Framework.Scenes
if (m_part.ParentGroup.m_savedScriptState != null) if (m_part.ParentGroup.m_savedScriptState != null)
RestoreSavedScriptState(item.OldItemID, item.ItemID); RestoreSavedScriptState(item.OldItemID, item.ItemID);
lock (m_items) m_items.LockItemsForWrite(true);
{
m_items[item.ItemID].PermsMask = 0; m_items[item.ItemID].PermsMask = 0;
m_items[item.ItemID].PermsGranter = UUID.Zero; m_items[item.ItemID].PermsGranter = UUID.Zero;
}
m_items.LockItemsForWrite(false);
string script = Utils.BytesToString(asset.Data); string script = Utils.BytesToString(asset.Data);
m_part.ParentGroup.Scene.EventManager.TriggerRezScript( m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
@ -713,14 +714,15 @@ namespace OpenSim.Region.Framework.Scenes
{ {
IList<TaskInventoryItem> items = new List<TaskInventoryItem>(); IList<TaskInventoryItem> items = new List<TaskInventoryItem>();
lock (m_items) m_items.LockItemsForRead(true);
{
foreach (TaskInventoryItem item in m_items.Values) foreach (TaskInventoryItem item in m_items.Values)
{ {
if (item.Name == name) if (item.Name == name)
items.Add(item); items.Add(item);
} }
}
m_items.LockItemsForRead(false);
return items; return items;
} }
@ -1114,6 +1116,11 @@ namespace OpenSim.Region.Framework.Scenes
} }
public Dictionary<UUID, string> GetScriptStates() public Dictionary<UUID, string> GetScriptStates()
{
return GetScriptStates(false);
}
public Dictionary<UUID, string> GetScriptStates(bool oldIDs)
{ {
IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>(); IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
@ -1131,9 +1138,17 @@ namespace OpenSim.Region.Framework.Scenes
{ {
string n = e.GetXMLState(item.ItemID); string n = e.GetXMLState(item.ItemID);
if (n != String.Empty) if (n != String.Empty)
{
if (oldIDs)
{
if (!ret.ContainsKey(item.OldItemID))
ret[item.OldItemID] = n;
}
else
{ {
if (!ret.ContainsKey(item.ItemID)) if (!ret.ContainsKey(item.ItemID))
ret[item.ItemID] = n; ret[item.ItemID] = n;
}
break; break;
} }
} }