diff options
author | Justin Clarke Casey | 2008-11-07 22:08:58 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-07 22:08:58 +0000 |
commit | ba1d9ca26b7b5e865824e16dc8930e85ef27eb54 (patch) | |
tree | f294fd0129360fef926a7ebd610adf4b7b813afa /OpenSim/Region/Environment/Scenes | |
parent | * Rename PrimIDAllocate() to more effectively convey what it does, and put th... (diff) | |
download | opensim-SC-ba1d9ca26b7b5e865824e16dc8930e85ef27eb54.zip opensim-SC-ba1d9ca26b7b5e865824e16dc8930e85ef27eb54.tar.gz opensim-SC-ba1d9ca26b7b5e865824e16dc8930e85ef27eb54.tar.bz2 opensim-SC-ba1d9ca26b7b5e865824e16dc8930e85ef27eb54.tar.xz |
* refactor: cleanup AllocateLocalPrimId() a bit more
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index cb4c2f5..833b765 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1606,6 +1606,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1606 | m_log.ErrorFormat("[SCENE] Found a SceneObjectGroup with m_rootPart == null and {0} children", | 1606 | m_log.ErrorFormat("[SCENE] Found a SceneObjectGroup with m_rootPart == null and {0} children", |
1607 | group.Children == null ? 0 : group.Children.Count); | 1607 | group.Children == null ? 0 : group.Children.Count); |
1608 | } | 1608 | } |
1609 | |||
1609 | AddRestoredSceneObject(group, true, true); | 1610 | AddRestoredSceneObject(group, true, true); |
1610 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); | 1611 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); |
1611 | rootPart.ObjectFlags &= ~(uint)PrimFlags.Scripted; | 1612 | rootPart.ObjectFlags &= ~(uint)PrimFlags.Scripted; |
@@ -1621,7 +1622,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1621 | /// Returns a new unallocated local primitive ID | 1622 | /// Returns a new unallocated local primitive ID |
1622 | /// </summary> | 1623 | /// </summary> |
1623 | /// <returns>A brand new local primitive ID</returns> | 1624 | /// <returns>A brand new local primitive ID</returns> |
1624 | public uint AllocateLocalPrimId() | 1625 | protected internal uint AllocateLocalPrimId() |
1625 | { | 1626 | { |
1626 | uint myID; | 1627 | uint myID; |
1627 | 1628 | ||