aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-07 21:50:03 +0000
committerJustin Clarke Casey2008-11-07 21:50:03 +0000
commitfb694fb177a02199e6a4ff1f48f866d10e2ef29e (patch)
tree7a5d39f7382cbc13031b7a6084b91bdc25f44fd9 /OpenSim/Region/Environment/Scenes
parent* Remove next local id from SceneBase (diff)
downloadopensim-SC_OLD-fb694fb177a02199e6a4ff1f48f866d10e2ef29e.zip
opensim-SC_OLD-fb694fb177a02199e6a4ff1f48f866d10e2ef29e.tar.gz
opensim-SC_OLD-fb694fb177a02199e6a4ff1f48f866d10e2ef29e.tar.bz2
opensim-SC_OLD-fb694fb177a02199e6a4ff1f48f866d10e2ef29e.tar.xz
* Rename PrimIDAllocate() to more effectively convey what it does, and put the verb at the front
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs11
2 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 3931cf0..cb4c2f5 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1621,7 +1621,7 @@ namespace OpenSim.Region.Environment.Scenes
1621 /// Returns a new unallocated local primitive ID 1621 /// Returns a new unallocated local primitive ID
1622 /// </summary> 1622 /// </summary>
1623 /// <returns>A brand new local primitive ID</returns> 1623 /// <returns>A brand new local primitive ID</returns>
1624 public uint PrimIDAllocate() 1624 public uint AllocateLocalPrimId()
1625 { 1625 {
1626 uint myID; 1626 uint myID;
1627 1627
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 54ccaad..bb80fd0 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -567,7 +567,7 @@ namespace OpenSim.Region.Environment.Scenes
567 RegionHandle = m_scene.RegionInfo.RegionHandle; 567 RegionHandle = m_scene.RegionInfo.RegionHandle;
568 568
569 m_rootPart.ParentID = 0; 569 m_rootPart.ParentID = 0;
570 m_rootPart.LocalId = m_scene.PrimIDAllocate(); 570 m_rootPart.LocalId = m_scene.AllocateLocalPrimId();
571 571
572 // No need to lock here since the object isn't yet in a scene 572 // No need to lock here since the object isn't yet in a scene
573 foreach (SceneObjectPart part in m_parts.Values) 573 foreach (SceneObjectPart part in m_parts.Values)
@@ -575,7 +575,7 @@ namespace OpenSim.Region.Environment.Scenes
575 if (Object.ReferenceEquals(part, m_rootPart)) 575 if (Object.ReferenceEquals(part, m_rootPart))
576 continue; 576 continue;
577 577
578 part.LocalId = m_scene.PrimIDAllocate(); 578 part.LocalId = m_scene.AllocateLocalPrimId();
579 part.ParentID = m_rootPart.LocalId; 579 part.ParentID = m_rootPart.LocalId;
580 //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); 580 //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);
581 } 581 }
@@ -1394,7 +1394,7 @@ namespace OpenSim.Region.Environment.Scenes
1394 /// <param name="cGroupID"></param> 1394 /// <param name="cGroupID"></param>
1395 public void CopyRootPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed) 1395 public void CopyRootPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed)
1396 { 1396 {
1397 SceneObjectPart newPart = part.Copy(m_scene.PrimIDAllocate(), OwnerID, GroupID, m_parts.Count, userExposed); 1397 SceneObjectPart newPart = part.Copy(m_scene.AllocateLocalPrimId(), OwnerID, GroupID, m_parts.Count, userExposed);
1398 newPart.SetParent(this); 1398 newPart.SetParent(this);
1399 1399
1400 lock (m_parts) 1400 lock (m_parts)
@@ -1514,7 +1514,7 @@ namespace OpenSim.Region.Environment.Scenes
1514 /// <param name="cGroupID"></param> 1514 /// <param name="cGroupID"></param>
1515 public void CopyPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed) 1515 public void CopyPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed)
1516 { 1516 {
1517 SceneObjectPart newPart = part.Copy(m_scene.PrimIDAllocate(), OwnerID, GroupID, m_parts.Count, userExposed); 1517 SceneObjectPart newPart = part.Copy(m_scene.AllocateLocalPrimId(), OwnerID, GroupID, m_parts.Count, userExposed);
1518 newPart.SetParent(this); 1518 newPart.SetParent(this);
1519 1519
1520 lock (m_parts) 1520 lock (m_parts)
@@ -2676,13 +2676,14 @@ namespace OpenSim.Region.Environment.Scenes
2676 scriptPosTarget waypoint = new scriptPosTarget(); 2676 scriptPosTarget waypoint = new scriptPosTarget();
2677 waypoint.targetPos = target; 2677 waypoint.targetPos = target;
2678 waypoint.tolerance = tolerance; 2678 waypoint.tolerance = tolerance;
2679 uint handle = m_scene.PrimIDAllocate(); 2679 uint handle = m_scene.AllocateLocalPrimId();
2680 lock (m_targets) 2680 lock (m_targets)
2681 { 2681 {
2682 m_targets.Add(handle, waypoint); 2682 m_targets.Add(handle, waypoint);
2683 } 2683 }
2684 return (int)handle; 2684 return (int)handle;
2685 } 2685 }
2686
2686 public void unregisterTargetWaypoint(int handle) 2687 public void unregisterTargetWaypoint(int handle)
2687 { 2688 {
2688 lock (m_targets) 2689 lock (m_targets)