diff options
author | Justin Clarke Casey | 2008-07-12 19:05:12 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-12 19:05:12 +0000 |
commit | 654b3424c7999067869415e0a3c6b538a81c558c (patch) | |
tree | 1e4e04c900b85a8e46eb7e4690bfb9728a89d1e7 /OpenSim | |
parent | * Start compressing archives (diff) | |
download | opensim-SC_OLD-654b3424c7999067869415e0a3c6b538a81c558c.zip opensim-SC_OLD-654b3424c7999067869415e0a3c6b538a81c558c.tar.gz opensim-SC_OLD-654b3424c7999067869415e0a3c6b538a81c558c.tar.bz2 opensim-SC_OLD-654b3424c7999067869415e0a3c6b538a81c558c.tar.xz |
* Remove warning and tidy up logic in SceneObjectGroup.UpdatePrimFlags()
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index f2c94c8..1482f9a 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -1997,22 +1997,21 @@ namespace OpenSim.Region.Environment.Scenes | |||
1997 | } | 1997 | } |
1998 | 1998 | ||
1999 | /// <summary> | 1999 | /// <summary> |
2000 | /// | 2000 | /// Update prim flags for this group. |
2001 | /// </summary> | 2001 | /// </summary> |
2002 | /// <param name="localID"></param> | 2002 | /// <param name="localID"></param> |
2003 | /// <param name="type"></param> | 2003 | /// <param name="type"></param> |
2004 | /// <param name="inUse"></param> | 2004 | /// <param name="inUse"></param> |
2005 | /// <param name="data"></param> | 2005 | /// <param name="data"></param> |
2006 | /// | ||
2007 | public void UpdatePrimFlags(uint localID, ushort type, bool inUse, byte[] data) | 2006 | public void UpdatePrimFlags(uint localID, ushort type, bool inUse, byte[] data) |
2008 | { | 2007 | { |
2009 | SceneObjectPart part = GetChildPart(localID); | 2008 | SceneObjectPart selectionPart = GetChildPart(localID); |
2010 | if (part != null) | 2009 | |
2010 | if (selectionPart != null) | ||
2011 | { | 2011 | { |
2012 | // If we have children | ||
2013 | lock (m_parts) | 2012 | lock (m_parts) |
2014 | { | 2013 | { |
2015 | foreach (SceneObjectPart parts in m_parts.Values) | 2014 | foreach (SceneObjectPart part in m_parts.Values) |
2016 | { | 2015 | { |
2017 | if (part.Scale.X > 10.0 || part.Scale.Y > 10.0 || part.Scale.Z > 10.0) | 2016 | if (part.Scale.X > 10.0 || part.Scale.Y > 10.0 || part.Scale.Z > 10.0) |
2018 | { | 2017 | { |
@@ -2021,14 +2020,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2021 | } | 2020 | } |
2022 | } | 2021 | } |
2023 | 2022 | ||
2024 | if (m_parts.Count > 1) | 2023 | foreach (SceneObjectPart part in m_parts.Values) |
2025 | { | ||
2026 | foreach (SceneObjectPart parts in m_parts.Values) | ||
2027 | { | ||
2028 | parts.UpdatePrimFlags(type, inUse, data); | ||
2029 | } | ||
2030 | } | ||
2031 | else | ||
2032 | { | 2024 | { |
2033 | part.UpdatePrimFlags(type, inUse, data); | 2025 | part.UpdatePrimFlags(type, inUse, data); |
2034 | } | 2026 | } |