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

Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection

viewer-2-initial-appearance
John Hurliman 2010-09-16 17:30:46 -07:00
parent f5e3d5a33a
commit 860b2a502f
32 changed files with 1033 additions and 1180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/MSSQL/MSSQLSimulationData.cs
View File

@ -241,7 +241,7 @@ namespace OpenSim.Data.MSSQL
/// <param name="regionUUID"></param> /// <param name="regionUUID"></param>
public void StoreObject(SceneObjectGroup obj, UUID regionUUID) public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
{ {
_Log.DebugFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count); _Log.DebugFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Parts.Length);
using (SqlConnection conn = new SqlConnection(m_connectionString)) using (SqlConnection conn = new SqlConnection(m_connectionString))
{ {
@ -250,7 +250,7 @@ namespace OpenSim.Data.MSSQL
try try
{ {
foreach (SceneObjectPart sceneObjectPart in obj.Children.Values) foreach (SceneObjectPart sceneObjectPart in obj.Parts)
{ {
//Update prim //Update prim
using (SqlCommand sqlCommand = conn.CreateCommand()) using (SqlCommand sqlCommand = conn.CreateCommand())

2
OpenSim/Data/MySQL/MySQLSimulationData.cs
View File

@ -144,7 +144,7 @@ namespace OpenSim.Data.MySQL
dbcon.Open(); dbcon.Open();
MySqlCommand cmd = dbcon.CreateCommand(); MySqlCommand cmd = dbcon.CreateCommand();
foreach (SceneObjectPart prim in obj.Children.Values) foreach (SceneObjectPart prim in obj.Parts)
{ {
cmd.Parameters.Clear(); cmd.Parameters.Clear();

2
OpenSim/Data/SQLite/SQLiteSimulationData.cs
View File

@ -368,7 +368,7 @@ namespace OpenSim.Data.SQLite
lock (ds) lock (ds)
{ {
foreach (SceneObjectPart prim in obj.Children.Values) foreach (SceneObjectPart prim in obj.Parts)
{ {
// m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); // m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
addPrim(prim, obj.UUID, regionUUID); addPrim(prim, obj.UUID, regionUUID);

2
OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
View File

@ -335,7 +335,7 @@ namespace OpenSim.Data.SQLiteLegacy
lock (ds) lock (ds)
{ {
foreach (SceneObjectPart prim in obj.Children.Values) foreach (SceneObjectPart prim in obj.Parts)
{ {
// m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); // m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
addPrim(prim, obj.UUID, regionUUID); addPrim(prim, obj.UUID, regionUUID);

14
OpenSim/Data/Tests/RegionTests.cs
View File

@ -232,15 +232,15 @@ namespace OpenSim.Data.Tests
sog.AddPart(p2); sog.AddPart(p2);
sog.AddPart(p3); sog.AddPart(p3);
SceneObjectPart[] parts = sog.GetParts(); SceneObjectPart[] parts = sog.Parts;
Assert.That(parts.Length,Is.EqualTo(4), "Assert.That(parts.Length,Is.EqualTo(4))"); Assert.That(parts.Length,Is.EqualTo(4), "Assert.That(parts.Length,Is.EqualTo(4))");
db.StoreObject(sog, newregion); db.StoreObject(sog, newregion);
List<SceneObjectGroup> sogs = db.LoadObjects(newregion); List<SceneObjectGroup> sogs = db.LoadObjects(newregion);
Assert.That(sogs.Count,Is.EqualTo(1), "Assert.That(sogs.Count,Is.EqualTo(1))"); Assert.That(sogs.Count,Is.EqualTo(1), "Assert.That(sogs.Count,Is.EqualTo(1))");
SceneObjectGroup newsog = sogs[0]; SceneObjectGroup newsog = sogs[0];
SceneObjectPart[] newparts = newsog.GetParts(); SceneObjectPart[] newparts = newsog.Parts;
Assert.That(newparts.Length,Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))"); Assert.That(newparts.Length,Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))");
Assert.That(newsog.HasChildPrim(tmp0), "Assert.That(newsog.HasChildPrim(tmp0))"); Assert.That(newsog.HasChildPrim(tmp0), "Assert.That(newsog.HasChildPrim(tmp0))");
@ -560,7 +560,7 @@ namespace OpenSim.Data.Tests
} }
SceneObjectGroup retsog = FindSOG("Test SOG", region4); SceneObjectGroup retsog = FindSOG("Test SOG", region4);
SceneObjectPart[] parts = retsog.GetParts(); SceneObjectPart[] parts = retsog.Parts;
for (int i=0;i<30;i++) for (int i=0;i<30;i++)
{ {
SceneObjectPart cursop = mydic[parts[i].UUID]; SceneObjectPart cursop = mydic[parts[i].UUID];
@ -607,7 +607,7 @@ namespace OpenSim.Data.Tests
sog.AddPart(p2); sog.AddPart(p2);
sog.AddPart(p3); sog.AddPart(p3);
SceneObjectPart[] parts = sog.GetParts(); SceneObjectPart[] parts = sog.Parts;
Assert.That(parts.Length, Is.EqualTo(4), "Assert.That(parts.Length,Is.EqualTo(4))"); Assert.That(parts.Length, Is.EqualTo(4), "Assert.That(parts.Length,Is.EqualTo(4))");
db.StoreObject(sog, newregion); db.StoreObject(sog, newregion);
@ -615,7 +615,7 @@ namespace OpenSim.Data.Tests
Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count,Is.EqualTo(1))"); Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count,Is.EqualTo(1))");
SceneObjectGroup newsog = sogs[0]; SceneObjectGroup newsog = sogs[0];
SceneObjectPart[] newparts = newsog.GetParts(); SceneObjectPart[] newparts = newsog.Parts;
Assert.That(newparts.Length, Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))"); Assert.That(newparts.Length, Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))");
Assert.That(newsog, Constraints.PropertyCompareConstraint(sog) Assert.That(newsog, Constraints.PropertyCompareConstraint(sog)
@ -625,7 +625,7 @@ namespace OpenSim.Data.Tests
.IgnoreProperty(x=>x.RegionHandle) .IgnoreProperty(x=>x.RegionHandle)
.IgnoreProperty(x=>x.RegionUUID) .IgnoreProperty(x=>x.RegionUUID)
.IgnoreProperty(x=>x.Scene) .IgnoreProperty(x=>x.Scene)
.IgnoreProperty(x=>x.Children) .IgnoreProperty(x=>x.Parts)
.IgnoreProperty(x=>x.PassCollision) .IgnoreProperty(x=>x.PassCollision)
.IgnoreProperty(x=>x.RootPart)); .IgnoreProperty(x=>x.RootPart));
} }

188
OpenSim/Framework/MapAndArray.cs Normal file
View File

@ -0,0 +1,188 @@
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
namespace OpenSim.Framework
{
/// <summary>
/// Stores two synchronized collections: a mutable dictionary and an
/// immutable array. Slower inserts/removes than a normal dictionary,
/// but provides safe iteration while maintaining fast hash lookups
/// </summary>
/// <typeparam name="TKey">Key type to use for hash lookups</typeparam>
/// <typeparam name="TValue">Value type to store</typeparam>
public sealed class MapAndArray<TKey, TValue>
{
private Dictionary<TKey, TValue> m_dict;
private TValue[] m_array;
private object m_syncRoot = new object();
/// <summary>Number of values currently stored in the collection</summary>
public int Count { get { return m_array.Length; } }
/// <summary>NOTE: This collection is thread safe. You do not need to
/// acquire a lock to add, remove, or enumerate entries. This
/// synchronization object should only be locked for larger
/// transactions</summary>
public object SyncRoot { get { return m_syncRoot; } }
/// <summary>
/// Constructor
/// </summary>
public MapAndArray()
{
m_dict = new Dictionary<TKey, TValue>();
m_array = new TValue[0];
}
/// <summary>
/// Constructor
/// </summary>
/// <param name="capacity">Initial capacity of the dictionary</param>
public MapAndArray(int capacity)
{
m_dict = new Dictionary<TKey, TValue>(capacity);
m_array = new TValue[0];
}
/// <summary>
/// Adds a key/value pair to the collection, or updates an existing key
/// with a new value
/// </summary>
/// <param name="key">Key to add or update</param>
/// <param name="value">Value to add</param>
/// <returns>True if a new key was added, false if an existing key was
/// updated</returns>
public bool AddOrReplace(TKey key, TValue value)
{
lock (m_syncRoot)
{
bool containedKey = m_dict.ContainsKey(key);
m_dict[key] = value;
CreateArray();
return !containedKey;
}
}
/// <summary>
/// Adds a key/value pair to the collection. This will throw an
/// exception if the key is already present in the collection
/// </summary>
/// <param name="key">Key to add or update</param>
/// <param name="value">Value to add</param>
/// <returns>Index of the inserted item</returns>
public int Add(TKey key, TValue value)
{
lock (m_syncRoot)
{
m_dict.Add(key, value);
CreateArray();
return m_array.Length;
}
}
/// <summary>
/// Removes a key/value pair from the collection
/// </summary>
/// <param name="key">Key to remove</param>
/// <returns>True if the key was found and removed, otherwise false</returns>
public bool Remove(TKey key)
{
lock (m_syncRoot)
{
bool removed = m_dict.Remove(key);
CreateArray();
return removed;
}
}
/// <summary>
/// Determines whether the collections contains a specified key
/// </summary>
/// <param name="key">Key to search for</param>
/// <returns>True if the key was found, otherwise false</returns>
public bool ContainsKey(TKey key)
{
return m_dict.ContainsKey(key);
}
/// <summary>
/// Gets the value associated with the specified key
/// </summary>
/// <param name="key">Key of the value to get</param>
/// <param name="value">Will contain the value associated with the
/// given key if the key is found. If the key is not found it will
/// contain the default value for the type of the value parameter</param>
/// <returns>True if the key was found and a value was retrieved,
/// otherwise false</returns>
public bool TryGetValue(TKey key, out TValue value)
{
lock (m_syncRoot)
return m_dict.TryGetValue(key, out value);
}
/// <summary>
/// Clears all key/value pairs from the collection
/// </summary>
public void Clear()
{
lock (m_syncRoot)
{
m_dict = new Dictionary<TKey, TValue>();
m_array = new TValue[0];
}
}
/// <summary>
/// Gets a reference to the immutable array of values stored in this
/// collection. This array is thread safe for iteration
/// </summary>
/// <returns>A thread safe reference ton an array of all of the stored
/// values</returns>
public TValue[] GetArray()
{
return m_array;
}
private void CreateArray()
{
// Rebuild the array from the dictionary. This method must be
// called from inside a lock
TValue[] array = new TValue[m_dict.Count];
int i = 0;
foreach (TValue value in m_dict.Values)
array[i++] = value;
m_array = array;
}
}
}

10
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@ -567,13 +567,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
so.RootPart.AttachedAvatar = avatar.UUID; so.RootPart.AttachedAvatar = avatar.UUID;
//Anakin Lohner bug #3839 //Anakin Lohner bug #3839
lock (so.Children) SceneObjectPart[] parts = so.Parts;
{ for (int i = 0; i < parts.Length; i++)
foreach (SceneObjectPart p in so.Children.Values) parts[i].AttachedAvatar = avatar.UUID;
{
p.AttachedAvatar = avatar.UUID;
}
}
if (so.RootPart.PhysActor != null) if (so.RootPart.PhysActor != null)
{ {

8
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -594,10 +594,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
rootPart.Name = item.Name; rootPart.Name = item.Name;
rootPart.Description = item.Description; rootPart.Description = item.Description;
List<SceneObjectPart> partList = null;
lock (group.Children)
partList = new List<SceneObjectPart>(group.Children.Values);
group.SetGroup(remoteClient.ActiveGroupId, remoteClient); group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
if ((rootPart.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0) if ((rootPart.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0)
{ {
@ -607,7 +603,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
if (m_Scene.Permissions.PropagatePermissions()) if (m_Scene.Permissions.PropagatePermissions())
{ {
foreach (SceneObjectPart part in partList) foreach (SceneObjectPart part in group.Parts)
{ {
part.EveryoneMask = item.EveryOnePermissions; part.EveryoneMask = item.EveryOnePermissions;
part.NextOwnerMask = item.NextPermissions; part.NextOwnerMask = item.NextPermissions;
@ -618,7 +614,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
} }
} }
foreach (SceneObjectPart part in partList) foreach (SceneObjectPart part in group.Parts)
{ {
if ((part.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0) if ((part.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0)
{ {

6
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@ -243,11 +243,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
// to the same scene (when this is possible). // to the same scene (when this is possible).
sceneObject.ResetIDs(); sceneObject.ResetIDs();
List<SceneObjectPart> partList = null; foreach (SceneObjectPart part in sceneObject.Parts)
lock (sceneObject.Children)
partList = new List<SceneObjectPart>(sceneObject.Children.Values);
foreach (SceneObjectPart part in partList)
{ {
if (!ResolveUserUuid(part.CreatorID)) if (!ResolveUserUuid(part.CreatorID))
part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner; part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;

7
OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
View File

@ -128,14 +128,9 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
group.SetOwnerId(remoteClient.AgentId); group.SetOwnerId(remoteClient.AgentId);
group.SetRootPartOwner(part, remoteClient.AgentId, remoteClient.ActiveGroupId); group.SetRootPartOwner(part, remoteClient.AgentId, remoteClient.ActiveGroupId);
List<SceneObjectPart> partList = null;
lock (group.Children)
partList = new List<SceneObjectPart>(group.Children.Values);
if (m_scene.Permissions.PropagatePermissions()) if (m_scene.Permissions.PropagatePermissions())
{ {
foreach (SceneObjectPart child in partList) foreach (SceneObjectPart child in group.Parts)
{ {
child.Inventory.ChangeInventoryOwner(remoteClient.AgentId); child.Inventory.ChangeInventoryOwner(remoteClient.AgentId);
child.TriggerScriptChangedEvent(Changed.OWNER); child.TriggerScriptChangedEvent(Changed.OWNER);

6
OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
View File

@ -229,11 +229,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
Color mapdotspot = Color.Gray; // Default color when prim color is white Color mapdotspot = Color.Gray; // Default color when prim color is white
// Loop over prim in group // Loop over prim in group
List<SceneObjectPart> partList = null; foreach (SceneObjectPart part in mapdot.Parts)
lock (mapdot.Children)
partList = new List<SceneObjectPart>(mapdot.Children.Values);
foreach (SceneObjectPart part in partList)
{ {
if (part == null) if (part == null)
continue; continue;

8
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -2051,9 +2051,7 @@ namespace OpenSim.Region.Framework.Scenes
sog.SetGroup(groupID, remoteClient); sog.SetGroup(groupID, remoteClient);
sog.ScheduleGroupForFullUpdate(); sog.ScheduleGroupForFullUpdate();
List<SceneObjectPart> partList = null; SceneObjectPart[] partList = sog.Parts;
lock (sog.Children)
partList = new List<SceneObjectPart>(sog.Children.Values);
foreach (SceneObjectPart child in partList) foreach (SceneObjectPart child in partList)
child.Inventory.ChangeInventoryOwner(ownerID); child.Inventory.ChangeInventoryOwner(ownerID);
@ -2066,9 +2064,7 @@ namespace OpenSim.Region.Framework.Scenes
if (sog.GroupID != groupID) if (sog.GroupID != groupID)
continue; continue;
List<SceneObjectPart> partList = null; SceneObjectPart[] partList = sog.Parts;
lock (sog.Children)
partList = new List<SceneObjectPart>(sog.Children.Values);
foreach (SceneObjectPart child in partList) foreach (SceneObjectPart child in partList)
{ {

5
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
View File

@ -161,11 +161,8 @@ namespace OpenSim.Region.Framework.Scenes
bool foundPrim = false; bool foundPrim = false;
SceneObjectGroup sog = ent as SceneObjectGroup; SceneObjectGroup sog = ent as SceneObjectGroup;
List<SceneObjectPart> partList = null;
lock (sog.Children)
partList = new List<SceneObjectPart>(sog.Children.Values);
SceneObjectPart[] partList = sog.Parts;
foreach (SceneObjectPart part in partList) foreach (SceneObjectPart part in partList)
{ {
if (part.LocalId == primLocalID) if (part.LocalId == primLocalID)

14
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1785,7 +1785,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
m_log.ErrorFormat( m_log.ErrorFormat(
"[SCENE]: Found a SceneObjectGroup with m_rootPart == null and {0} children", "[SCENE]: Found a SceneObjectGroup with m_rootPart == null and {0} children",
group.Children == null ? 0 : group.PrimCount); group.Parts == null ? 0 : group.PrimCount);
} }
AddRestoredSceneObject(group, true, true); AddRestoredSceneObject(group, true, true);
@ -2091,9 +2091,7 @@ namespace OpenSim.Region.Framework.Scenes
group.RemoveScriptInstances(true); group.RemoveScriptInstances(true);
} }
List<SceneObjectPart> partList = null; SceneObjectPart[] partList = group.Parts;
lock (group.Children)
partList = new List<SceneObjectPart>(group.Children.Values);
foreach (SceneObjectPart part in partList) foreach (SceneObjectPart part in partList)
{ {
@ -2465,11 +2463,9 @@ namespace OpenSim.Region.Framework.Scenes
// Force allocation of new LocalId // Force allocation of new LocalId
// //
lock (sceneObject.Children) SceneObjectPart[] parts = sceneObject.Parts;
{ for (int i = 0; i < parts.Length; i++)
foreach (SceneObjectPart p in sceneObject.Children.Values) parts[i].LocalId = 0;
p.LocalId = 0;
}
if (sceneObject.IsAttachmentCheckFull()) // Attachment if (sceneObject.IsAttachmentCheckFull()) // Attachment
{ {

53
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -348,9 +348,7 @@ namespace OpenSim.Region.Framework.Scenes
if (Entities.ContainsKey(sceneObject.UUID)) if (Entities.ContainsKey(sceneObject.UUID))
return false; return false;
List<SceneObjectPart> children; SceneObjectPart[] children = sceneObject.Parts;
lock (sceneObject.Children)
children = new List<SceneObjectPart>(sceneObject.Children.Values);
// Clamp child prim sizes and add child prims to the m_numPrim count // Clamp child prim sizes and add child prims to the m_numPrim count
if (m_parentScene.m_clampPrimSize) if (m_parentScene.m_clampPrimSize)
@ -369,7 +367,7 @@ namespace OpenSim.Region.Framework.Scenes
part.Shape.Scale = scale; part.Shape.Scale = scale;
} }
} }
m_numPrim += children.Count; m_numPrim += children.Length;
sceneObject.AttachToScene(m_parentScene); sceneObject.AttachToScene(m_parentScene);
@ -426,15 +424,17 @@ namespace OpenSim.Region.Framework.Scenes
lock (SceneObjectGroupsByFullID) lock (SceneObjectGroupsByFullID)
{ {
foreach (SceneObjectPart part in grp.Children.Values) SceneObjectPart[] parts = grp.Parts;
SceneObjectGroupsByFullID.Remove(part.UUID); for (int i = 0; i < parts.Length; i++)
SceneObjectGroupsByFullID.Remove(parts[i].UUID);
SceneObjectGroupsByFullID.Remove(grp.RootPart.UUID); SceneObjectGroupsByFullID.Remove(grp.RootPart.UUID);
} }
lock (SceneObjectGroupsByLocalID) lock (SceneObjectGroupsByLocalID)
{ {
foreach (SceneObjectPart part in grp.Children.Values) SceneObjectPart[] parts = grp.Parts;
SceneObjectGroupsByLocalID.Remove(part.LocalId); for (int i = 0; i < parts.Length; i++)
SceneObjectGroupsByLocalID.Remove(parts[i].LocalId);
SceneObjectGroupsByLocalID.Remove(grp.RootPart.LocalId); SceneObjectGroupsByLocalID.Remove(grp.RootPart.LocalId);
} }
@ -887,11 +887,8 @@ namespace OpenSim.Region.Framework.Scenes
if (sog != null) if (sog != null)
{ {
lock (sog.Children) if (sog.ContainsPart(fullID))
{ return sog;
if (sog.Children.ContainsKey(fullID))
return sog;
}
lock (SceneObjectGroupsByFullID) lock (SceneObjectGroupsByFullID)
SceneObjectGroupsByFullID.Remove(fullID); SceneObjectGroupsByFullID.Remove(fullID);
@ -965,7 +962,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (entity is SceneObjectGroup) if (entity is SceneObjectGroup)
{ {
foreach (SceneObjectPart p in ((SceneObjectGroup)entity).GetParts()) foreach (SceneObjectPart p in ((SceneObjectGroup)entity).Parts)
{ {
if (p.Name == name) if (p.Name == name)
{ {
@ -1626,14 +1623,8 @@ namespace OpenSim.Region.Framework.Scenes
// //
SceneObjectGroup group = root.ParentGroup; SceneObjectGroup group = root.ParentGroup;
List<SceneObjectPart> newSet = null; List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts);
int numChildren = -1; int numChildren = newSet.Count;
lock (group.Children)
{
newSet = new List<SceneObjectPart>(group.Children.Values);
numChildren = group.PrimCount;
}
// If there are prims left in a link set, but the root is // If there are prims left in a link set, but the root is
// slated for unlink, we need to do this // slated for unlink, we need to do this
@ -1711,16 +1702,13 @@ namespace OpenSim.Region.Framework.Scenes
if (ent is SceneObjectGroup) if (ent is SceneObjectGroup)
{ {
SceneObjectGroup sog = ent as SceneObjectGroup; SceneObjectGroup sog = ent as SceneObjectGroup;
lock (sog.Children) foreach (SceneObjectPart part in sog.Parts)
{ {
foreach (KeyValuePair<UUID, SceneObjectPart> subent in sog.Children) if (part.LocalId == localID)
{ {
if (subent.Value.LocalId == localID) objid = part.UUID;
{ obj = part;
objid = subent.Key;
obj = subent.Value;
}
} }
} }
} }
@ -1796,8 +1784,7 @@ namespace OpenSim.Region.Framework.Scenes
copy.SetOwnerId(AgentID); copy.SetOwnerId(AgentID);
copy.SetRootPartOwner(copy.RootPart, AgentID, GroupID); copy.SetRootPartOwner(copy.RootPart, AgentID, GroupID);
List<SceneObjectPart> partList = SceneObjectPart[] partList = copy.Parts;
new List<SceneObjectPart>(copy.Children.Values);
if (m_parentScene.Permissions.PropagatePermissions()) if (m_parentScene.Permissions.PropagatePermissions())
{ {
@ -1822,7 +1809,7 @@ namespace OpenSim.Region.Framework.Scenes
// think it's selected, so it will never send a deselect... // think it's selected, so it will never send a deselect...
copy.IsSelected = false; copy.IsSelected = false;
m_numPrim += copy.Children.Count; m_numPrim += copy.Parts.Length;
if (rot != Quaternion.Identity) if (rot != Quaternion.Identity)
{ {

58
OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
View File

@ -46,13 +46,9 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
public void ForceInventoryPersistence() public void ForceInventoryPersistence()
{ {
lock (m_parts) SceneObjectPart[] parts = m_parts.GetArray();
{ for (int i = 0; i < parts.Length; i++)
foreach (SceneObjectPart part in m_parts.Values) parts[i].Inventory.ForceInventoryPersistence();
{
part.Inventory.ForceInventoryPersistence();
}
}
} }
/// <summary> /// <summary>
@ -64,10 +60,9 @@ namespace OpenSim.Region.Framework.Scenes
// Don't start scripts if they're turned off in the region! // Don't start scripts if they're turned off in the region!
if (!m_scene.RegionInfo.RegionSettings.DisableScripts) if (!m_scene.RegionInfo.RegionSettings.DisableScripts)
{ {
foreach (SceneObjectPart part in m_parts.Values) SceneObjectPart[] parts = m_parts.GetArray();
{ for (int i = 0; i < parts.Length; i++)
part.Inventory.CreateScriptInstances(startParam, postOnRez, engine, stateSource); parts[i].Inventory.CreateScriptInstances(startParam, postOnRez, engine, stateSource);
}
} }
} }
@ -80,13 +75,9 @@ namespace OpenSim.Region.Framework.Scenes
/// </param> /// </param>
public void RemoveScriptInstances(bool sceneObjectBeingDeleted) public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
{ {
lock (m_parts) SceneObjectPart[] parts = m_parts.GetArray();
{ for (int i = 0; i < parts.Length; i++)
foreach (SceneObjectPart part in m_parts.Values) parts[i].Inventory.RemoveScriptInstances(sceneObjectBeingDeleted);
{
part.Inventory.RemoveScriptInstances(sceneObjectBeingDeleted);
}
}
} }
/// <summary> /// <summary>
@ -283,8 +274,11 @@ namespace OpenSim.Region.Framework.Scenes
PermissionMask.Transfer) | 7; PermissionMask.Transfer) | 7;
uint ownerMask = 0x7fffffff; uint ownerMask = 0x7fffffff;
foreach (SceneObjectPart part in m_parts.Values)
SceneObjectPart[] parts = m_parts.GetArray();
for (int i = 0; i < parts.Length; i++)
{ {
SceneObjectPart part = parts[i];
ownerMask &= part.OwnerMask; ownerMask &= part.OwnerMask;
perms &= part.Inventory.MaskEffectivePermissions(); perms &= part.Inventory.MaskEffectivePermissions();
} }
@ -312,39 +306,40 @@ namespace OpenSim.Region.Framework.Scenes
public void ApplyNextOwnerPermissions() public void ApplyNextOwnerPermissions()
{ {
foreach (SceneObjectPart part in m_parts.Values) SceneObjectPart[] parts = m_parts.GetArray();
{ for (int i = 0; i < parts.Length; i++)
part.ApplyNextOwnerPermissions(); parts[i].ApplyNextOwnerPermissions();
}
} }
public string GetStateSnapshot() public string GetStateSnapshot()
{ {
Dictionary<UUID, string> states = new Dictionary<UUID, string>(); Dictionary<UUID, string> states = new Dictionary<UUID, string>();
foreach (SceneObjectPart part in m_parts.Values) SceneObjectPart[] parts = m_parts.GetArray();
for (int i = 0; i < parts.Length; i++)
{ {
SceneObjectPart part = parts[i];
foreach (KeyValuePair<UUID, string> s in part.Inventory.GetScriptStates()) foreach (KeyValuePair<UUID, string> s in part.Inventory.GetScriptStates())
states[s.Key] = s.Value; states[s.Key] = s.Value;
} }
if (states.Count < 1) if (states.Count < 1)
return ""; return String.Empty;
XmlDocument xmldoc = new XmlDocument(); XmlDocument xmldoc = new XmlDocument();
XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration, XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
"", ""); String.Empty, String.Empty);
xmldoc.AppendChild(xmlnode); xmldoc.AppendChild(xmlnode);
XmlElement rootElement = xmldoc.CreateElement("", "ScriptData", XmlElement rootElement = xmldoc.CreateElement("", "ScriptData",
""); String.Empty);
xmldoc.AppendChild(rootElement); xmldoc.AppendChild(rootElement);
XmlElement wrapper = xmldoc.CreateElement("", "ScriptStates", XmlElement wrapper = xmldoc.CreateElement("", "ScriptStates",
""); String.Empty);
rootElement.AppendChild(wrapper); rootElement.AppendChild(wrapper);
@ -424,10 +419,9 @@ namespace OpenSim.Region.Framework.Scenes
public void ResumeScripts() public void ResumeScripts()
{ {
foreach (SceneObjectPart part in m_parts.Values) SceneObjectPart[] parts = m_parts.GetArray();
{ for (int i = 0; i < parts.Length; i++)
part.Inventory.ResumeScripts(); parts[i].Inventory.ResumeScripts();
}
} }
} }
} }

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

File diff suppressed because it is too large Load Diff

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

@ -603,10 +603,7 @@ namespace OpenSim.Region.Framework.Scenes
rootPart.Name = item.Name; rootPart.Name = item.Name;
rootPart.Description = item.Description; rootPart.Description = item.Description;
List<SceneObjectPart> partList = null; SceneObjectPart[] partList = group.Parts;
lock (group.Children)
partList = new List<SceneObjectPart>(group.Children.Values);
group.SetGroup(m_part.GroupID, null); group.SetGroup(m_part.GroupID, null);

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1709,7 +1709,7 @@ namespace OpenSim.Region.Framework.Scenes
// If the primitive the player clicked on has no sit target, and one or more other linked objects have sit targets that are not full, the sit target of the object with the lowest link number will be used. // If the primitive the player clicked on has no sit target, and one or more other linked objects have sit targets that are not full, the sit target of the object with the lowest link number will be used.
// Get our own copy of the part array, and sort into the order we want to test // Get our own copy of the part array, and sort into the order we want to test
SceneObjectPart[] partArray = targetPart.ParentGroup.GetParts(); SceneObjectPart[] partArray = targetPart.ParentGroup.Parts;
Array.Sort(partArray, delegate(SceneObjectPart p1, SceneObjectPart p2) Array.Sort(partArray, delegate(SceneObjectPart p1, SceneObjectPart p2)
{ {
// we want the originally selected part first, then the rest in link order -- so make the selected part link num (-1) // we want the originally selected part first, then the rest in link order -- so make the selected part link num (-1)

28
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@ -158,16 +158,15 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
writer.WriteEndElement(); writer.WriteEndElement();
writer.WriteStartElement(String.Empty, "OtherParts", String.Empty); writer.WriteStartElement(String.Empty, "OtherParts", String.Empty);
lock (sceneObject.Children) SceneObjectPart[] parts = sceneObject.Parts;
for (int i = 0; i < parts.Length; i++)
{ {
foreach (SceneObjectPart part in sceneObject.Children.Values) SceneObjectPart part = parts[i];
if (part.UUID != sceneObject.RootPart.UUID)
{ {
if (part.UUID != sceneObject.RootPart.UUID) writer.WriteStartElement(String.Empty, "Part", String.Empty);
{ ToOriginalXmlFormat(part, writer);
writer.WriteStartElement(String.Empty, "Part", String.Empty); writer.WriteEndElement();
ToOriginalXmlFormat(part, writer);
writer.WriteEndElement();
}
} }
} }
@ -281,15 +280,12 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
sceneObject.RootPart.ToXml(writer); sceneObject.RootPart.ToXml(writer);
writer.WriteStartElement(String.Empty, "OtherParts", String.Empty); writer.WriteStartElement(String.Empty, "OtherParts", String.Empty);
lock (sceneObject.Children) SceneObjectPart[] parts = sceneObject.Parts;
for (int i = 0; i < parts.Length; i++)
{ {
foreach (SceneObjectPart part in sceneObject.Children.Values) SceneObjectPart part = parts[i];
{ if (part.UUID != sceneObject.RootPart.UUID)
if (part.UUID != sceneObject.RootPart.UUID) part.ToXml(writer);
{
part.ToXml(writer);
}
}
} }
writer.WriteEndElement(); // End of OtherParts writer.WriteEndElement(); // End of OtherParts

2
OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
View File

@ -68,7 +68,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
SceneObjectGroup dupeSo SceneObjectGroup dupeSo
= scene.SceneGraph.DuplicateObject( = scene.SceneGraph.DuplicateObject(
part1.LocalId, new Vector3(10, 0, 0), 0, ownerId, UUID.Zero, Quaternion.Identity); part1.LocalId, new Vector3(10, 0, 0), 0, ownerId, UUID.Zero, Quaternion.Identity);
Assert.That(dupeSo.Children.Count, Is.EqualTo(2)); Assert.That(dupeSo.Parts.Length, Is.EqualTo(2));
SceneObjectPart dupePart1 = dupeSo.GetLinkNumPart(1); SceneObjectPart dupePart1 = dupeSo.GetLinkNumPart(1);
SceneObjectPart dupePart2 = dupeSo.GetLinkNumPart(2); SceneObjectPart dupePart2 = dupeSo.GetLinkNumPart(2);

36
OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
View File

@ -81,12 +81,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// FIXME: Can't do this test yet since group 2 still has its root part! We can't yet null this since // FIXME: Can't do this test yet since group 2 still has its root part! We can't yet null this since
// it might cause SOG.ProcessBackup() to fail due to the race condition. This really needs to be fixed. // it might cause SOG.ProcessBackup() to fail due to the race condition. This really needs to be fixed.
Assert.That(grp2.IsDeleted, "SOG 2 was not registered as deleted after link."); Assert.That(grp2.IsDeleted, "SOG 2 was not registered as deleted after link.");
Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained children after delink."); Assert.That(grp2.Parts.Length, Is.EqualTo(0), "Group 2 still contained children after delink.");
Assert.That(grp1.Children.Count == 2); Assert.That(grp1.Parts.Length == 2);
if (debugtest) if (debugtest)
{ {
m_log.Debug("parts: " + grp1.Children.Count); m_log.Debug("parts: " + grp1.Parts.Length);
m_log.Debug("Group1: Pos:"+grp1.AbsolutePosition+", Rot:"+grp1.Rotation); m_log.Debug("Group1: Pos:"+grp1.AbsolutePosition+", Rot:"+grp1.Rotation);
m_log.Debug("Group1: Prim1: OffsetPosition:"+ part1.OffsetPosition+", OffsetRotation:"+part1.RotationOffset); m_log.Debug("Group1: Prim1: OffsetPosition:"+ part1.OffsetPosition+", OffsetRotation:"+part1.RotationOffset);
m_log.Debug("Group1: Prim2: OffsetPosition:"+part2.OffsetPosition+", OffsetRotation:"+part2.RotationOffset); m_log.Debug("Group1: Prim2: OffsetPosition:"+part2.OffsetPosition+", OffsetRotation:"+part2.RotationOffset);
@ -126,7 +126,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
if (debugtest) if (debugtest)
m_log.Debug("Group2: Prim2: OffsetPosition:" + part2.AbsolutePosition + ", OffsetRotation:" + part2.RotationOffset); m_log.Debug("Group2: Prim2: OffsetPosition:" + part2.AbsolutePosition + ", OffsetRotation:" + part2.RotationOffset);
Assert.That(grp1.Children.Count, Is.EqualTo(1), "Group 1 still contained part2 after delink."); Assert.That(grp1.Parts.Length, Is.EqualTo(1), "Group 1 still contained part2 after delink.");
Assert.That(part2.AbsolutePosition == Vector3.Zero, "The absolute position should be zero"); Assert.That(part2.AbsolutePosition == Vector3.Zero, "The absolute position should be zero");
} }
@ -177,22 +177,22 @@ namespace OpenSim.Region.Framework.Scenes.Tests
grp3.LinkToGroup(grp4); grp3.LinkToGroup(grp4);
// At this point we should have 4 parts total in two groups. // At this point we should have 4 parts total in two groups.
Assert.That(grp1.Children.Count == 2, "Group1 children count should be 2"); Assert.That(grp1.Parts.Length == 2, "Group1 children count should be 2");
Assert.That(grp2.IsDeleted, "Group 2 was not registered as deleted after link."); Assert.That(grp2.IsDeleted, "Group 2 was not registered as deleted after link.");
Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained parts after delink."); Assert.That(grp2.Parts.Length, Is.EqualTo(0), "Group 2 still contained parts after delink.");
Assert.That(grp3.Children.Count == 2, "Group3 children count should be 2"); Assert.That(grp3.Parts.Length == 2, "Group3 children count should be 2");
Assert.That(grp4.IsDeleted, "Group 4 was not registered as deleted after link."); Assert.That(grp4.IsDeleted, "Group 4 was not registered as deleted after link.");
Assert.That(grp4.Children.Count, Is.EqualTo(0), "Group 4 still contained parts after delink."); Assert.That(grp4.Parts.Length, Is.EqualTo(0), "Group 4 still contained parts after delink.");
if (debugtest) if (debugtest)
{ {
m_log.Debug("--------After Link-------"); m_log.Debug("--------After Link-------");
m_log.Debug("Group1: parts:" + grp1.Children.Count); m_log.Debug("Group1: parts:" + grp1.Parts.Length);
m_log.Debug("Group1: Pos:"+grp1.AbsolutePosition+", Rot:"+grp1.Rotation); m_log.Debug("Group1: Pos:"+grp1.AbsolutePosition+", Rot:"+grp1.Rotation);
m_log.Debug("Group1: Prim1: OffsetPosition:" + part1.OffsetPosition + ", OffsetRotation:" + part1.RotationOffset); m_log.Debug("Group1: Prim1: OffsetPosition:" + part1.OffsetPosition + ", OffsetRotation:" + part1.RotationOffset);
m_log.Debug("Group1: Prim2: OffsetPosition:"+part2.OffsetPosition+", OffsetRotation:"+ part2.RotationOffset); m_log.Debug("Group1: Prim2: OffsetPosition:"+part2.OffsetPosition+", OffsetRotation:"+ part2.RotationOffset);
m_log.Debug("Group3: parts:"+grp3.Children.Count); m_log.Debug("Group3: parts:" + grp3.Parts.Length);
m_log.Debug("Group3: Pos:"+grp3.AbsolutePosition+", Rot:"+grp3.Rotation); m_log.Debug("Group3: Pos:"+grp3.AbsolutePosition+", Rot:"+grp3.Rotation);
m_log.Debug("Group3: Prim1: OffsetPosition:"+part3.OffsetPosition+", OffsetRotation:"+part3.RotationOffset); m_log.Debug("Group3: Prim1: OffsetPosition:"+part3.OffsetPosition+", OffsetRotation:"+part3.RotationOffset);
m_log.Debug("Group3: Prim2: OffsetPosition:"+part4.OffsetPosition+", OffsetRotation:"+part4.RotationOffset); m_log.Debug("Group3: Prim2: OffsetPosition:"+part4.OffsetPosition+", OffsetRotation:"+part4.RotationOffset);
@ -240,12 +240,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
if (debugtest) if (debugtest)
{ {
m_log.Debug("--------After De-Link-------"); m_log.Debug("--------After De-Link-------");
m_log.Debug("Group1: parts:" + grp1.Children.Count); m_log.Debug("Group1: parts:" + grp1.Parts.Length);
m_log.Debug("Group1: Pos:" + grp1.AbsolutePosition + ", Rot:" + grp1.Rotation); m_log.Debug("Group1: Pos:" + grp1.AbsolutePosition + ", Rot:" + grp1.Rotation);
m_log.Debug("Group1: Prim1: OffsetPosition:" + part1.OffsetPosition + ", OffsetRotation:" + part1.RotationOffset); m_log.Debug("Group1: Prim1: OffsetPosition:" + part1.OffsetPosition + ", OffsetRotation:" + part1.RotationOffset);
m_log.Debug("Group1: Prim2: OffsetPosition:" + part2.OffsetPosition + ", OffsetRotation:" + part2.RotationOffset); m_log.Debug("Group1: Prim2: OffsetPosition:" + part2.OffsetPosition + ", OffsetRotation:" + part2.RotationOffset);
m_log.Debug("Group3: parts:" + grp3.Children.Count); m_log.Debug("Group3: parts:" + grp3.Parts.Length);
m_log.Debug("Group3: Pos:" + grp3.AbsolutePosition + ", Rot:" + grp3.Rotation); m_log.Debug("Group3: Pos:" + grp3.AbsolutePosition + ", Rot:" + grp3.Rotation);
m_log.Debug("Group3: Prim1: OffsetPosition:" + part3.OffsetPosition + ", OffsetRotation:" + part3.RotationOffset); m_log.Debug("Group3: Prim1: OffsetPosition:" + part3.OffsetPosition + ", OffsetRotation:" + part3.RotationOffset);
m_log.Debug("Group3: Prim2: OffsetPosition:" + part4.OffsetPosition + ", OffsetRotation:" + part4.RotationOffset); m_log.Debug("Group3: Prim2: OffsetPosition:" + part4.OffsetPosition + ", OffsetRotation:" + part4.RotationOffset);
@ -295,9 +295,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
List<SceneObjectGroup> storedObjects = scene.SimulationDataService.LoadObjects(scene.RegionInfo.RegionID); List<SceneObjectGroup> storedObjects = scene.SimulationDataService.LoadObjects(scene.RegionInfo.RegionID);
Assert.That(storedObjects.Count, Is.EqualTo(1)); Assert.That(storedObjects.Count, Is.EqualTo(1));
Assert.That(storedObjects[0].Children.Count, Is.EqualTo(2)); Assert.That(storedObjects[0].Parts.Length, Is.EqualTo(2));
Assert.That(storedObjects[0].Children.ContainsKey(rootPartUuid)); Assert.That(storedObjects[0].ContainsPart(rootPartUuid));
Assert.That(storedObjects[0].Children.ContainsKey(linkPartUuid)); Assert.That(storedObjects[0].ContainsPart(linkPartUuid));
} }
/// <summary> /// <summary>
@ -338,8 +338,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
List<SceneObjectGroup> storedObjects = scene.SimulationDataService.LoadObjects(scene.RegionInfo.RegionID); List<SceneObjectGroup> storedObjects = scene.SimulationDataService.LoadObjects(scene.RegionInfo.RegionID);
Assert.That(storedObjects.Count, Is.EqualTo(1)); Assert.That(storedObjects.Count, Is.EqualTo(1));
Assert.That(storedObjects[0].Children.Count, Is.EqualTo(1)); Assert.That(storedObjects[0].Parts.Length, Is.EqualTo(1));
Assert.That(storedObjects[0].Children.ContainsKey(rootPartUuid)); Assert.That(storedObjects[0].ContainsPart(rootPartUuid));
} }
} }
} }

5
OpenSim/Region/Framework/Scenes/UuidGatherer.cs
View File

@ -121,8 +121,11 @@ namespace OpenSim.Region.Framework.Scenes
// m_log.DebugFormat( // m_log.DebugFormat(
// "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID); // "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID);
foreach (SceneObjectPart part in sceneObject.GetParts()) SceneObjectPart[] parts = sceneObject.Parts;
for (int i = 0; i < parts.Length; i++)
{ {
SceneObjectPart part = parts[i];
// m_log.DebugFormat( // m_log.DebugFormat(
// "[ARCHIVER]: Getting part {0}, {1} for object {2}", part.Name, part.UUID, sceneObject.UUID); // "[ARCHIVER]: Getting part {0}, {1} for object {2}", part.Name, part.UUID, sceneObject.UUID);

19
OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs
View File

@ -121,19 +121,16 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
continue; continue;
temp = (SceneObjectGroup) currObj; temp = (SceneObjectGroup) currObj;
lock (temp.Children) if (m_CMEntityHash.ContainsKey(temp.UUID))
{ {
if (m_CMEntityHash.ContainsKey(temp.UUID)) foreach (SceneObjectPart part in temp.Parts)
{ if (!((ContentManagementEntity)m_CMEntityHash[temp.UUID]).HasChildPrim(part.UUID))
foreach (SceneObjectPart part in temp.Children.Values)
if (!((ContentManagementEntity)m_CMEntityHash[temp.UUID]).HasChildPrim(part.UUID))
missingList.Add(part);
}
else //Entire group is missing from revision. (and is a new part in region)
{
foreach (SceneObjectPart part in temp.Children.Values)
missingList.Add(part); missingList.Add(part);
} }
else //Entire group is missing from revision. (and is a new part in region)
{
foreach (SceneObjectPart part in temp.Parts)
missingList.Add(part);
} }
} }
return missingList; return missingList;

35
OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
View File

@ -167,11 +167,11 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
public void RemoveOrUpdateDeletedEntity(SceneObjectGroup group) public void RemoveOrUpdateDeletedEntity(SceneObjectGroup group)
{ {
// Deal with new parts not revisioned that have been deleted. // Deal with new parts not revisioned that have been deleted.
lock (group.Children) SceneObjectPart[] parts = group.Parts;
for (int i = 0; i < parts.Length; i++)
{ {
foreach (SceneObjectPart part in group.Children.Values) if (m_MetaEntityCollection.Auras.ContainsKey(parts[i].UUID))
if (m_MetaEntityCollection.Auras.ContainsKey(part.UUID)) m_MetaEntityCollection.RemoveNewlyCreatedEntityAura(parts[i].UUID);
m_MetaEntityCollection.RemoveNewlyCreatedEntityAura(part.UUID);
} }
} }
@ -210,12 +210,10 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
{ {
temp = SceneObjectSerializer.FromXml2Format(xml); temp = SceneObjectSerializer.FromXml2Format(xml);
temp.SetScene(scene); temp.SetScene(scene);
lock (temp.Children) SceneObjectPart[] parts = temp.Parts;
{ for (int i = 0; i < parts.Length; i++)
foreach (SceneObjectPart part in temp.Children.Values) parts[i].RegionHandle = scene.RegionInfo.RegionHandle;
part.RegionHandle = scene.RegionInfo.RegionHandle;
}
ReplacementList.Add(temp.UUID, (EntityBase)temp); ReplacementList.Add(temp.UUID, (EntityBase)temp);
} }
@ -346,17 +344,16 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
System.Collections.ArrayList auraList = new System.Collections.ArrayList(); System.Collections.ArrayList auraList = new System.Collections.ArrayList();
if (group == null) if (group == null)
return null; return null;
lock (group.Children) SceneObjectPart[] parts = group.Parts;
for (int i = 0; i < parts.Length; i++)
{ {
foreach (SceneObjectPart part in group.Children.Values) SceneObjectPart part = parts[i];
if (m_MetaEntityCollection.Auras.ContainsKey(part.UUID))
{ {
if (m_MetaEntityCollection.Auras.ContainsKey(part.UUID)) ((AuraMetaEntity)m_MetaEntityCollection.Auras[part.UUID]).SetAura(new Vector3(0, 254, 0), part.Scale);
{ ((AuraMetaEntity)m_MetaEntityCollection.Auras[part.UUID]).RootPart.GroupPosition = part.GetWorldPosition();
((AuraMetaEntity)m_MetaEntityCollection.Auras[part.UUID]).SetAura(new Vector3(0,254,0), part.Scale); auraList.Add((AuraMetaEntity)m_MetaEntityCollection.Auras[part.UUID]);
((AuraMetaEntity)m_MetaEntityCollection.Auras[part.UUID]).RootPart.GroupPosition = part.GetWorldPosition();
auraList.Add((AuraMetaEntity)m_MetaEntityCollection.Auras[part.UUID]);
}
} }
} }

9
OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs
View File

@ -186,12 +186,9 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
((ContentManagementEntity)m_model.MetaEntityCollection.Entities[group.UUID]).SendFullDiffUpdateToAll(); ((ContentManagementEntity)m_model.MetaEntityCollection.Entities[group.UUID]).SendFullDiffUpdateToAll();
// Deal with new parts not revisioned that have been deleted. // Deal with new parts not revisioned that have been deleted.
lock (group.Children) foreach (SceneObjectPart part in group.Parts)
{ if (m_model.MetaEntityCollection.Auras.ContainsKey(part.UUID))
foreach (SceneObjectPart part in group.Children.Values) ((AuraMetaEntity)m_model.MetaEntityCollection.Auras[part.UUID]).HideFromAll();
if (m_model.MetaEntityCollection.Auras.ContainsKey(part.UUID))
((AuraMetaEntity)m_model.MetaEntityCollection.Auras[part.UUID]).HideFromAll();
}
} }
public void SendMetaEntitiesToNewClient(IClientAPI client) public void SendMetaEntitiesToNewClient(IClientAPI client)

169
OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
View File

@ -132,33 +132,30 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
// if group is not contained in scene's list // if group is not contained in scene's list
if (!ContainsKey(sceneEntityList, m_UnchangedEntity.UUID)) if (!ContainsKey(sceneEntityList, m_UnchangedEntity.UUID))
{ {
lock (m_UnchangedEntity.Children) foreach (SceneObjectPart part in m_UnchangedEntity.Parts)
{ {
foreach (SceneObjectPart part in m_UnchangedEntity.Children.Values) // if scene list no longer contains this part, display translucent part and mark with red aura
if (!ContainsKey(sceneEntityList, part.UUID))
{ {
// if scene list no longer contains this part, display translucent part and mark with red aura // if already displaying a red aura over part, make sure its red
if (!ContainsKey(sceneEntityList, part.UUID)) if (m_AuraEntities.ContainsKey(part.UUID))
{ {
// if already displaying a red aura over part, make sure its red m_AuraEntities[part.UUID].SetAura(new Vector3(254, 0, 0), part.Scale);
if (m_AuraEntities.ContainsKey(part.UUID))
{
m_AuraEntities[part.UUID].SetAura(new Vector3(254,0,0), part.Scale);
}
else
{
AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
part.GetWorldPosition(),
MetaEntity.TRANSLUCENT,
new Vector3(254,0,0),
part.Scale
);
m_AuraEntities.Add(part.UUID, auraGroup);
}
SceneObjectPart metaPart = m_Entity.GetLinkNumPart(part.LinkNum);
SetPartTransparency(metaPart, MetaEntity.TRANSLUCENT);
} }
// otherwise, scene will not contain the part. note: a group can not remove a part without changing group id else
{
AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
part.GetWorldPosition(),
MetaEntity.TRANSLUCENT,
new Vector3(254, 0, 0),
part.Scale
);
m_AuraEntities.Add(part.UUID, auraGroup);
}
SceneObjectPart metaPart = m_Entity.GetLinkNumPart(part.LinkNum);
SetPartTransparency(metaPart, MetaEntity.TRANSLUCENT);
} }
// otherwise, scene will not contain the part. note: a group can not remove a part without changing group id
} }
// a deleted part has no where to point a beam particle system, // a deleted part has no where to point a beam particle system,
@ -183,11 +180,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
/// </summary> /// </summary>
public bool HasChildPrim(UUID uuid) public bool HasChildPrim(UUID uuid)
{ {
lock (m_UnchangedEntity.Children) return m_UnchangedEntity.ContainsPart(uuid);
if (m_UnchangedEntity.Children.ContainsKey(uuid))
return true;
return false;
} }
/// <summary> /// <summary>
@ -195,12 +188,9 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
/// </summary> /// </summary>
public bool HasChildPrim(uint localID) public bool HasChildPrim(uint localID)
{ {
lock (m_UnchangedEntity.Children) foreach (SceneObjectPart part in m_UnchangedEntity.Parts)
{ if (part.LocalId == localID)
foreach (SceneObjectPart part in m_UnchangedEntity.Children.Values) return true;
if (part.LocalId == localID)
return true;
}
return false; return false;
} }
@ -237,72 +227,37 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
// Use "UnchangedEntity" to do comparisons because its text, transparency, and other attributes will be just as the user // Use "UnchangedEntity" to do comparisons because its text, transparency, and other attributes will be just as the user
// had originally saved. // had originally saved.
// m_Entity will NOT necessarily be the same entity as the user had saved. // m_Entity will NOT necessarily be the same entity as the user had saved.
lock (m_UnchangedEntity.Children) foreach (SceneObjectPart UnchangedPart in m_UnchangedEntity.Parts)
{ {
foreach (SceneObjectPart UnchangedPart in m_UnchangedEntity.Children.Values) //This is the part that we use to show changes.
metaEntityPart = m_Entity.GetLinkNumPart(UnchangedPart.LinkNum);
if (sceneEntityGroup.ContainsPart(UnchangedPart.UUID))
{ {
//This is the part that we use to show changes. sceneEntityPart = sceneEntityGroup.GetChildPart(UnchangedPart.UUID);
metaEntityPart = m_Entity.GetLinkNumPart(UnchangedPart.LinkNum); differences = Difference.FindDifferences(UnchangedPart, sceneEntityPart);
if (sceneEntityGroup.Children.ContainsKey(UnchangedPart.UUID)) if (differences != Diff.NONE)
metaEntityPart.Text = "CHANGE: " + differences.ToString();
if (differences != 0)
{ {
sceneEntityPart = sceneEntityGroup.Children[UnchangedPart.UUID]; // Root Part that has been modified
differences = Difference.FindDifferences(UnchangedPart, sceneEntityPart); if ((differences & Diff.POSITION) > 0)
if (differences != Diff.NONE)
metaEntityPart.Text = "CHANGE: " + differences.ToString();
if (differences != 0)
{
// Root Part that has been modified
if ((differences&Diff.POSITION) > 0)
{
// If the position of any part has changed, make sure the RootPart of the
// meta entity is pointing with a beam particle system
if (m_BeamEntities.ContainsKey(m_UnchangedEntity.RootPart.UUID))
{
m_BeamEntities[m_UnchangedEntity.RootPart.UUID].HideFromAll();
m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID);
}
BeamMetaEntity beamGroup = new BeamMetaEntity(m_Entity.Scene,
m_UnchangedEntity.RootPart.GetWorldPosition(),
MetaEntity.TRANSLUCENT,
sceneEntityPart,
new Vector3(0,0,254)
);
m_BeamEntities.Add(m_UnchangedEntity.RootPart.UUID, beamGroup);
}
if (m_AuraEntities.ContainsKey(UnchangedPart.UUID))
{
m_AuraEntities[UnchangedPart.UUID].HideFromAll();
m_AuraEntities.Remove(UnchangedPart.UUID);
}
AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
UnchangedPart.GetWorldPosition(),
MetaEntity.TRANSLUCENT,
new Vector3(0,0,254),
UnchangedPart.Scale
);
m_AuraEntities.Add(UnchangedPart.UUID, auraGroup);
SetPartTransparency(metaEntityPart, MetaEntity.TRANSLUCENT);
DiffersFromSceneGroup = true;
}
else // no differences between scene part and meta part
{ {
// If the position of any part has changed, make sure the RootPart of the
// meta entity is pointing with a beam particle system
if (m_BeamEntities.ContainsKey(m_UnchangedEntity.RootPart.UUID)) if (m_BeamEntities.ContainsKey(m_UnchangedEntity.RootPart.UUID))
{ {
m_BeamEntities[m_UnchangedEntity.RootPart.UUID].HideFromAll(); m_BeamEntities[m_UnchangedEntity.RootPart.UUID].HideFromAll();
m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID); m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID);
} }
if (m_AuraEntities.ContainsKey(UnchangedPart.UUID)) BeamMetaEntity beamGroup = new BeamMetaEntity(m_Entity.Scene,
{ m_UnchangedEntity.RootPart.GetWorldPosition(),
m_AuraEntities[UnchangedPart.UUID].HideFromAll(); MetaEntity.TRANSLUCENT,
m_AuraEntities.Remove(UnchangedPart.UUID); sceneEntityPart,
} new Vector3(0, 0, 254)
SetPartTransparency(metaEntityPart, MetaEntity.NONE); );
m_BeamEntities.Add(m_UnchangedEntity.RootPart.UUID, beamGroup);
} }
}
else //The entity currently in the scene is missing parts from the metaentity saved, so mark parts red as deleted.
{
if (m_AuraEntities.ContainsKey(UnchangedPart.UUID)) if (m_AuraEntities.ContainsKey(UnchangedPart.UUID))
{ {
m_AuraEntities[UnchangedPart.UUID].HideFromAll(); m_AuraEntities[UnchangedPart.UUID].HideFromAll();
@ -311,14 +266,46 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene, AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
UnchangedPart.GetWorldPosition(), UnchangedPart.GetWorldPosition(),
MetaEntity.TRANSLUCENT, MetaEntity.TRANSLUCENT,
new Vector3(254,0,0), new Vector3(0, 0, 254),
UnchangedPart.Scale UnchangedPart.Scale
); );
m_AuraEntities.Add(UnchangedPart.UUID, auraGroup); m_AuraEntities.Add(UnchangedPart.UUID, auraGroup);
SetPartTransparency(metaEntityPart, MetaEntity.TRANSLUCENT); SetPartTransparency(metaEntityPart, MetaEntity.TRANSLUCENT);
DiffersFromSceneGroup = true; DiffersFromSceneGroup = true;
} }
else // no differences between scene part and meta part
{
if (m_BeamEntities.ContainsKey(m_UnchangedEntity.RootPart.UUID))
{
m_BeamEntities[m_UnchangedEntity.RootPart.UUID].HideFromAll();
m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID);
}
if (m_AuraEntities.ContainsKey(UnchangedPart.UUID))
{
m_AuraEntities[UnchangedPart.UUID].HideFromAll();
m_AuraEntities.Remove(UnchangedPart.UUID);
}
SetPartTransparency(metaEntityPart, MetaEntity.NONE);
}
}
else //The entity currently in the scene is missing parts from the metaentity saved, so mark parts red as deleted.
{
if (m_AuraEntities.ContainsKey(UnchangedPart.UUID))
{
m_AuraEntities[UnchangedPart.UUID].HideFromAll();
m_AuraEntities.Remove(UnchangedPart.UUID);
}
AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
UnchangedPart.GetWorldPosition(),
MetaEntity.TRANSLUCENT,
new Vector3(254, 0, 0),
UnchangedPart.Scale
);
m_AuraEntities.Add(UnchangedPart.UUID, auraGroup);
SetPartTransparency(metaEntityPart, MetaEntity.TRANSLUCENT);
DiffersFromSceneGroup = true;
} }
} }

45
OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
View File

@ -98,10 +98,9 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
#region Public Properties #region Public Properties
public Dictionary<UUID, SceneObjectPart> Children public SceneObjectPart[] Parts
{ {
get { return m_Entity.Children; } get { return m_Entity.Parts; }
set { m_Entity.Children = value; }
} }
public uint LocalId public uint LocalId
@ -150,19 +149,17 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
{ {
//make new uuids //make new uuids
Dictionary<UUID, SceneObjectPart> parts = new Dictionary<UUID, SceneObjectPart>(); Dictionary<UUID, SceneObjectPart> parts = new Dictionary<UUID, SceneObjectPart>();
lock (m_Entity.Children) foreach (SceneObjectPart part in m_Entity.Parts)
{ {
foreach (SceneObjectPart part in m_Entity.Children.Values) part.ResetIDs(part.LinkNum);
{ parts.Add(part.UUID, part);
part.ResetIDs(part.LinkNum);
parts.Add(part.UUID, part);
}
//finalize
m_Entity.RootPart.PhysActor = null;
m_Entity.Children = parts;
} }
//finalize
m_Entity.RootPart.PhysActor = null;
foreach (SceneObjectPart part in parts.Values)
m_Entity.AddPart(part);
} }
#endregion Protected Methods #endregion Protected Methods
@ -177,11 +174,8 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
//This deletes the group without removing from any databases. //This deletes the group without removing from any databases.
//This is important because we are not IN any database. //This is important because we are not IN any database.
//m_Entity.FakeDeleteGroup(); //m_Entity.FakeDeleteGroup();
lock (m_Entity.Children) foreach (SceneObjectPart part in m_Entity.Parts)
{ client.SendKillObject(m_Entity.RegionHandle, part.LocalId);
foreach (SceneObjectPart part in m_Entity.Children.Values)
client.SendKillObject(m_Entity.RegionHandle, part.LocalId);
}
} }
/// <summary> /// <summary>
@ -189,15 +183,12 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
/// </summary> /// </summary>
public virtual void HideFromAll() public virtual void HideFromAll()
{ {
lock (m_Entity.Children) foreach (SceneObjectPart part in m_Entity.Parts)
{ {
foreach (SceneObjectPart part in m_Entity.Children.Values) m_Entity.Scene.ForEachClient(
{ delegate(IClientAPI controller)
m_Entity.Scene.ForEachClient( { controller.SendKillObject(m_Entity.RegionHandle, part.LocalId); }
delegate(IClientAPI controller) );
{ controller.SendKillObject(m_Entity.RegionHandle, part.LocalId); }
);
}
} }
} }

6
OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
View File

@ -193,11 +193,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
int i = 0; int i = 0;
List<SceneObjectPart> partList = null; foreach (SceneObjectPart part in my.ParentGroup.Parts)
lock (my.ParentGroup.Children)
partList = new List<SceneObjectPart>(my.ParentGroup.Children.Values);
foreach (SceneObjectPart part in partList)
{ {
rets[i++] = new SOPObject(m_rootScene, part.LocalId, m_security); rets[i++] = new SOPObject(m_rootScene, part.LocalId, m_security);
} }

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

@ -236,8 +236,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
case ScriptBaseClass.LINK_SET: case ScriptBaseClass.LINK_SET:
if (m_host.ParentGroup != null) if (m_host.ParentGroup != null)
{ {
lock (m_host.ParentGroup.Children) return new List<SceneObjectPart>(m_host.ParentGroup.Parts);
return new List<SceneObjectPart>(m_host.ParentGroup.Children.Values);
} }
return ret; return ret;
@ -254,8 +253,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (m_host.ParentGroup == null) if (m_host.ParentGroup == null)
return new List<SceneObjectPart>(); return new List<SceneObjectPart>();
lock (m_host.ParentGroup.Children) ret = new List<SceneObjectPart>(m_host.ParentGroup.Parts);
ret = new List<SceneObjectPart>(m_host.ParentGroup.Children.Values);
if (ret.Contains(m_host)) if (ret.Contains(m_host))
ret.Remove(m_host); ret.Remove(m_host);
@ -265,8 +263,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (m_host.ParentGroup == null) if (m_host.ParentGroup == null)
return new List<SceneObjectPart>(); return new List<SceneObjectPart>();
lock (m_host.ParentGroup.Children) ret = new List<SceneObjectPart>(m_host.ParentGroup.Parts);
ret = new List<SceneObjectPart>(m_host.ParentGroup.Children.Values);
if (ret.Contains(m_host.ParentGroup.RootPart)) if (ret.Contains(m_host.ParentGroup.RootPart))
ret.Remove(m_host.ParentGroup.RootPart); ret.Remove(m_host.ParentGroup.RootPart);
@ -1187,16 +1184,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (group == null) if (group == null)
return; return;
bool allow = true; bool allow = true;
lock (group.Children) foreach (SceneObjectPart part in group.Parts)
{ {
foreach (SceneObjectPart part in group.Children.Values) if (part.Scale.X > World.m_maxPhys || part.Scale.Y > World.m_maxPhys || part.Scale.Z > World.m_maxPhys)
{ {
if (part.Scale.X > World.m_maxPhys || part.Scale.Y > World.m_maxPhys || part.Scale.Z > World.m_maxPhys) allow = false;
{ break;
allow = false;
break;
}
} }
} }
@ -3617,18 +3611,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
case ScriptBaseClass.LINK_ALL_OTHERS: case ScriptBaseClass.LINK_ALL_OTHERS:
case ScriptBaseClass.LINK_ALL_CHILDREN: case ScriptBaseClass.LINK_ALL_CHILDREN:
case ScriptBaseClass.LINK_THIS: case ScriptBaseClass.LINK_THIS:
lock (parentPrim.Children) foreach (SceneObjectPart part in parentPrim.Parts)
{ {
foreach (SceneObjectPart part in parentPrim.Children.Values) if (part.UUID != m_host.UUID)
{ {
if (part.UUID != m_host.UUID) childPrim = part;
{ break;
childPrim = part;
break;
}
} }
break;
} }
break;
default: default:
childPrim = parentPrim.GetLinkNumPart(linknum); childPrim = parentPrim.GetLinkNumPart(linknum);
if (childPrim.UUID == m_host.UUID) if (childPrim.UUID == m_host.UUID)
@ -3639,30 +3630,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (linknum == ScriptBaseClass.LINK_ROOT) if (linknum == ScriptBaseClass.LINK_ROOT)
{ {
// Restructuring Multiple Prims. // Restructuring Multiple Prims.
lock (parentPrim.Children) List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts);
parts.Remove(parentPrim.RootPart);
foreach (SceneObjectPart part in parts)
{ {
List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Children.Values); parentPrim.DelinkFromGroup(part.LocalId, true);
parts.Remove(parentPrim.RootPart); }
parentPrim.HasGroupChanged = true;
parentPrim.ScheduleGroupForFullUpdate();
parentPrim.TriggerScriptChangedEvent(Changed.LINK);
if (parts.Count > 0)
{
SceneObjectPart newRoot = parts[0];
parts.Remove(newRoot);
foreach (SceneObjectPart part in parts) foreach (SceneObjectPart part in parts)
{ {
parentPrim.DelinkFromGroup(part.LocalId, true); part.UpdateFlag = 0;
} newRoot.ParentGroup.LinkToGroup(part.ParentGroup);
parentPrim.HasGroupChanged = true;
parentPrim.ScheduleGroupForFullUpdate();
parentPrim.TriggerScriptChangedEvent(Changed.LINK);
if (parts.Count > 0)
{
SceneObjectPart newRoot = parts[0];
parts.Remove(newRoot);
foreach (SceneObjectPart part in parts)
{
part.UpdateFlag = 0;
newRoot.ParentGroup.LinkToGroup(part.ParentGroup);
}
newRoot.ParentGroup.HasGroupChanged = true;
newRoot.ParentGroup.ScheduleGroupForFullUpdate();
} }
newRoot.ParentGroup.HasGroupChanged = true;
newRoot.ParentGroup.ScheduleGroupForFullUpdate();
} }
} }
else else
@ -3684,19 +3672,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (parentPrim.RootPart.AttachmentPoint != 0) if (parentPrim.RootPart.AttachmentPoint != 0)
return; // Fail silently if attached return; // Fail silently if attached
lock (parentPrim.Children) List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts);
parts.Remove(parentPrim.RootPart);
foreach (SceneObjectPart part in parts)
{ {
List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Children.Values); parentPrim.DelinkFromGroup(part.LocalId, true);
parts.Remove(parentPrim.RootPart); parentPrim.TriggerScriptChangedEvent(Changed.LINK);
foreach (SceneObjectPart part in parts)
{
parentPrim.DelinkFromGroup(part.LocalId, true);
parentPrim.TriggerScriptChangedEvent(Changed.LINK);
}
parentPrim.HasGroupChanged = true;
parentPrim.ScheduleGroupForFullUpdate();
} }
parentPrim.HasGroupChanged = true;
parentPrim.ScheduleGroupForFullUpdate();
} }
public LSL_String llGetLinkKey(int linknum) public LSL_String llGetLinkKey(int linknum)

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

@ -209,15 +209,12 @@ namespace OpenSim.Region.ScriptEngine.Shared
else else
Type = 0x02; // Passive Type = 0x02; // Passive
lock (part.ParentGroup.Children) foreach (SceneObjectPart p in part.ParentGroup.Parts)
{ {
foreach (SceneObjectPart p in part.ParentGroup.Children.Values) if (p.Inventory.ContainsScripts())
{ {
if (p.Inventory.ContainsScripts()) Type |= 0x08; // Scripted
{ break;
Type |= 0x08; // Scripted
break;
}
} }
} }

2
OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
View File

@ -163,7 +163,7 @@ namespace OpenSim.Data.Null
// We can't simply store groups here because on delinking, OpenSim will not update the original group // We can't simply store groups here because on delinking, OpenSim will not update the original group
// directly. Rather, the newly delinked parts will be updated to be in their own scene object group // directly. Rather, the newly delinked parts will be updated to be in their own scene object group
// Therefore, we need to store parts rather than groups. // Therefore, we need to store parts rather than groups.
foreach (SceneObjectPart prim in obj.Children.Values) foreach (SceneObjectPart prim in obj.Parts)
{ {
m_log.DebugFormat( m_log.DebugFormat(
"[MOCK REGION DATA PLUGIN]: Storing part {0} {1} in object {2} {3} in region {4}", "[MOCK REGION DATA PLUGIN]: Storing part {0} {1} in object {2} {3} in region {4}",