diff options
| author | Jeff Ames | 2008-11-21 18:44:48 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-11-21 18:44:48 +0000 |
| commit | ecac5c9c5a18241c62a25834b20be38ee0e38843 (patch) | |
| tree | a0a0678b8060d69cf01f9cba8f661fc856105142 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
| parent | * Largely revert the last revision and improve on the previous way of doing t... (diff) | |
| download | opensim-SC_OLD-ecac5c9c5a18241c62a25834b20be38ee0e38843.zip opensim-SC_OLD-ecac5c9c5a18241c62a25834b20be38ee0e38843.tar.gz opensim-SC_OLD-ecac5c9c5a18241c62a25834b20be38ee0e38843.tar.bz2 opensim-SC_OLD-ecac5c9c5a18241c62a25834b20be38ee0e38843.tar.xz | |
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index e8eaef8..f9eaa89 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
| @@ -593,9 +593,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 593 | RegionHandle = m_scene.RegionInfo.RegionHandle; | 593 | RegionHandle = m_scene.RegionInfo.RegionHandle; |
| 594 | 594 | ||
| 595 | m_rootPart.ParentID = 0; | 595 | m_rootPart.ParentID = 0; |
| 596 | if (m_rootPart.LocalId==0) | 596 | if (m_rootPart.LocalId==0) |
| 597 | m_rootPart.LocalId = m_scene.AllocateLocalId(); | 597 | m_rootPart.LocalId = m_scene.AllocateLocalId(); |
| 598 | |||
| 599 | 598 | ||
| 600 | // No need to lock here since the object isn't yet in a scene | 599 | // No need to lock here since the object isn't yet in a scene |
| 601 | foreach (SceneObjectPart part in m_parts.Values) | 600 | foreach (SceneObjectPart part in m_parts.Values) |
| @@ -603,7 +602,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 603 | if (Object.ReferenceEquals(part, m_rootPart)) | 602 | if (Object.ReferenceEquals(part, m_rootPart)) |
| 604 | continue; | 603 | continue; |
| 605 | if (part.LocalId==0) | 604 | if (part.LocalId==0) |
| 606 | part.LocalId = m_scene.AllocateLocalId(); | 605 | part.LocalId = m_scene.AllocateLocalId(); |
| 607 | part.ParentID = m_rootPart.LocalId; | 606 | part.ParentID = m_rootPart.LocalId; |
| 608 | //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID); | 607 | //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID); |
| 609 | } | 608 | } |