aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-10 18:10:00 +0000
committerJustin Clarke Casey2008-11-10 18:10:00 +0000
commit5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4 (patch)
tree8bf214cd45c9a94aae3d6ef8d76169f19006ae41 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
parentthis changeset adds an option to RemoteAdmin to limit the number of (diff)
downloadopensim-SC_OLD-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.zip
opensim-SC_OLD-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.tar.gz
opensim-SC_OLD-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.tar.bz2
opensim-SC_OLD-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.tar.xz
* Extend basic scene test to retrieve the object from the scene and match uuids
* Decouple sog and sop by removing the need to pass the sog to the sop when it is created - most of the code was doing this operation (and hence duplicating it) anyway * Remove unused constructors
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 28fba65..39615c0 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -507,9 +507,9 @@ namespace OpenSim.Region.Environment.Scenes
507 public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape) 507 public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
508 { 508 {
509 Vector3 rootOffset = new Vector3(0, 0, 0); 509 Vector3 rootOffset = new Vector3(0, 0, 0);
510 SceneObjectPart newPart = new SceneObjectPart(this, ownerID, shape, pos, rot, rootOffset); 510 SceneObjectPart newPart = new SceneObjectPart(ownerID, shape, pos, rot, rootOffset);
511 newPart.LinkNum = 0; 511 newPart.LinkNum = 0;
512 m_parts.Add(newPart.UUID, newPart); 512 AddPart(newPart);
513 SetPartAsRoot(newPart); 513 SetPartAsRoot(newPart);
514 } 514 }
515 515
@@ -904,7 +904,6 @@ namespace OpenSim.Region.Environment.Scenes
904 try 904 try
905 { 905 {
906 m_parts.Add(part.UUID, part); 906 m_parts.Add(part.UUID, part);
907
908 } 907 }
909 catch (Exception e) 908 catch (Exception e)
910 { 909 {
@@ -1757,10 +1756,12 @@ namespace OpenSim.Region.Environment.Scenes
1757 /// <returns>null if a child part with the local ID was not found</returns> 1756 /// <returns>null if a child part with the local ID was not found</returns>
1758 public SceneObjectPart GetChildPart(uint localID) 1757 public SceneObjectPart GetChildPart(uint localID)
1759 { 1758 {
1759 //m_log.DebugFormat("Entered looking for {0}", localID);
1760 lock (m_parts) 1760 lock (m_parts)
1761 { 1761 {
1762 foreach (SceneObjectPart part in m_parts.Values) 1762 foreach (SceneObjectPart part in m_parts.Values)
1763 { 1763 {
1764 //m_log.DebugFormat("Found {0}", part.LocalId);
1764 if (part.LocalId == localID) 1765 if (part.LocalId == localID)
1765 { 1766 {
1766 return part; 1767 return part;
@@ -1795,10 +1796,12 @@ namespace OpenSim.Region.Environment.Scenes
1795 /// <returns></returns> 1796 /// <returns></returns>
1796 public bool HasChildPrim(uint localID) 1797 public bool HasChildPrim(uint localID)
1797 { 1798 {
1799 //m_log.DebugFormat("Entered HasChildPrim looking for {0}", localID);
1798 lock (m_parts) 1800 lock (m_parts)
1799 { 1801 {
1800 foreach (SceneObjectPart part in m_parts.Values) 1802 foreach (SceneObjectPart part in m_parts.Values)
1801 { 1803 {
1804 //m_log.DebugFormat("Found {0}", part.LocalId);
1802 if (part.LocalId == localID) 1805 if (part.LocalId == localID)
1803 { 1806 {
1804 return true; 1807 return true;