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

* Remove warning and tidy up logic in SceneObjectGroup.UpdatePrimFlags()

0.6.0-stable
Justin Clarke Casey 2008-07-12 19:05:12 +00:00
parent 4e7dd0d919
commit 654b3424c7
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -1997,22 +1997,21 @@ namespace OpenSim.Region.Environment.Scenes
} }
/// <summary> /// <summary>
/// /// Update prim flags for this group.
/// </summary> /// </summary>
/// <param name="localID"></param> /// <param name="localID"></param>
/// <param name="type"></param> /// <param name="type"></param>
/// <param name="inUse"></param> /// <param name="inUse"></param>
/// <param name="data"></param> /// <param name="data"></param>
///
public void UpdatePrimFlags(uint localID, ushort type, bool inUse, byte[] data) public void UpdatePrimFlags(uint localID, ushort type, bool inUse, byte[] data)
{ {
SceneObjectPart part = GetChildPart(localID); SceneObjectPart selectionPart = GetChildPart(localID);
if (part != null)
if (selectionPart != null)
{ {
// If we have children
lock (m_parts) lock (m_parts)
{ {
foreach (SceneObjectPart parts in m_parts.Values) foreach (SceneObjectPart part in m_parts.Values)
{ {
if (part.Scale.X > 10.0 || part.Scale.Y > 10.0 || part.Scale.Z > 10.0) if (part.Scale.X > 10.0 || part.Scale.Y > 10.0 || part.Scale.Z > 10.0)
{ {
@ -2021,14 +2020,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
if (m_parts.Count > 1) foreach (SceneObjectPart part in m_parts.Values)
{
foreach (SceneObjectPart parts in m_parts.Values)
{
parts.UpdatePrimFlags(type, inUse, data);
}
}
else
{ {
part.UpdatePrimFlags(type, inUse, data); part.UpdatePrimFlags(type, inUse, data);
} }