aboutsummaryrefslogtreecommitdiffstatshomepage
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
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
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs8
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs11
-rw-r--r--OpenSim/Region/Examples/SimpleModule/RegionModule.cs4
6 files changed, 15 insertions, 14 deletions
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs
index 6bbc30c..f8c8a96 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
146 public AuraMetaEntity CreateAuraForNewlyCreatedEntity(SceneObjectPart part) 146 public AuraMetaEntity CreateAuraForNewlyCreatedEntity(SceneObjectPart part)
147 { 147 {
148 AuraMetaEntity ent = new AuraMetaEntity(part.ParentGroup.Scene, 148 AuraMetaEntity ent = new AuraMetaEntity(part.ParentGroup.Scene,
149 part.ParentGroup.Scene.PrimIDAllocate(), 149 part.ParentGroup.Scene.AllocateLocalPrimId(),
150 part.GetWorldPosition(), 150 part.GetWorldPosition(),
151 MetaEntity.TRANSLUCENT, 151 MetaEntity.TRANSLUCENT,
152 new Vector3(0,254,0), 152 new Vector3(0,254,0),
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
index 13f5cc0..ac2af34 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
153 else 153 else
154 { 154 {
155 AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene, 155 AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
156 m_Entity.Scene.PrimIDAllocate(), 156 m_Entity.Scene.AllocateLocalPrimId(),
157 part.GetWorldPosition(), 157 part.GetWorldPosition(),
158 MetaEntity.TRANSLUCENT, 158 MetaEntity.TRANSLUCENT,
159 new Vector3(254,0,0), 159 new Vector3(254,0,0),
@@ -260,7 +260,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
260 m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID); 260 m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID);
261 } 261 }
262 BeamMetaEntity beamGroup = new BeamMetaEntity(m_Entity.Scene, 262 BeamMetaEntity beamGroup = new BeamMetaEntity(m_Entity.Scene,
263 m_Entity.Scene.PrimIDAllocate(), 263 m_Entity.Scene.AllocateLocalPrimId(),
264 m_UnchangedEntity.RootPart.GetWorldPosition(), 264 m_UnchangedEntity.RootPart.GetWorldPosition(),
265 MetaEntity.TRANSLUCENT, 265 MetaEntity.TRANSLUCENT,
266 sceneEntityPart, 266 sceneEntityPart,
@@ -275,7 +275,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
275 m_AuraEntities.Remove(UnchangedPart.UUID); 275 m_AuraEntities.Remove(UnchangedPart.UUID);
276 } 276 }
277 AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene, 277 AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
278 m_Entity.Scene.PrimIDAllocate(), 278 m_Entity.Scene.AllocateLocalPrimId(),
279 UnchangedPart.GetWorldPosition(), 279 UnchangedPart.GetWorldPosition(),
280 MetaEntity.TRANSLUCENT, 280 MetaEntity.TRANSLUCENT,
281 new Vector3(0,0,254), 281 new Vector3(0,0,254),
@@ -309,7 +309,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
309 m_AuraEntities.Remove(UnchangedPart.UUID); 309 m_AuraEntities.Remove(UnchangedPart.UUID);
310 } 310 }
311 AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene, 311 AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
312 m_Entity.Scene.PrimIDAllocate(), 312 m_Entity.Scene.AllocateLocalPrimId(),
313 UnchangedPart.GetWorldPosition(), 313 UnchangedPart.GetWorldPosition(),
314 MetaEntity.TRANSLUCENT, 314 MetaEntity.TRANSLUCENT,
315 new Vector3(254,0,0), 315 new Vector3(254,0,0),
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
index fe685a5..a96547b 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
168 168
169 // make new localids 169 // make new localids
170 foreach (SceneObjectPart part in m_Entity.Children.Values) 170 foreach (SceneObjectPart part in m_Entity.Children.Values)
171 part.LocalId = m_Entity.Scene.PrimIDAllocate(); 171 part.LocalId = m_Entity.Scene.AllocateLocalPrimId();
172 172
173 //finalize 173 //finalize
174 m_Entity.RootPart.PhysActor = null; 174 m_Entity.RootPart.PhysActor = null;
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)
diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
index 4fc0dbb..b3965d7 100644
--- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
+++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Examples.SimpleModule
104 // { 104 // {
105 // Vector3 posOffset = new Vector3((i % objs) * 4, ((i % (objs*objs)) / (objs)) * 4, (i / (objs*objs)) * 4); 105 // Vector3 posOffset = new Vector3((i % objs) * 4, ((i % (objs*objs)) / (objs)) * 4, (i / (objs*objs)) * 4);
106 // ComplexObject complexObject = 106 // ComplexObject complexObject =
107 // new ComplexObject(m_scene, regionInfo.RegionHandle, UUID.Zero, m_scene.PrimIDAllocate(), 107 // new ComplexObject(m_scene, regionInfo.RegionHandle, UUID.Zero, m_scene.AllocateLocalPrimId(),
108 // pos + posOffset); 108 // pos + posOffset);
109 // m_scene.AddNewSceneObject(complexObject, true); 109 // m_scene.AddNewSceneObject(complexObject, true);
110 // } 110 // }
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Examples.SimpleModule
113 // private void AddCpuCounter(RegionInfo regionInfo, Vector3 pos) 113 // private void AddCpuCounter(RegionInfo regionInfo, Vector3 pos)
114 // { 114 // {
115 // SceneObjectGroup sceneObject = 115 // SceneObjectGroup sceneObject =
116 // new CpuCounterObject(m_scene, regionInfo.RegionHandle, UUID.Zero, m_scene.PrimIDAllocate(), 116 // new CpuCounterObject(m_scene, regionInfo.RegionHandle, UUID.Zero, m_scene.AllocateLocalPrimId(),
117 // pos + new Vector3(1f, 1f, 1f)); 117 // pos + new Vector3(1f, 1f, 1f));
118 // m_scene.AddNewSceneObject(sceneObject, true); 118 // m_scene.AddNewSceneObject(sceneObject, true);
119 // } 119 // }