From fb694fb177a02199e6a4ff1f48f866d10e2ef29e Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 7 Nov 2008 21:50:03 +0000
Subject: * Rename PrimIDAllocate() to more effectively convey what it does,
 and put the verb at the front

---
 .../Modules/ContentManagementSystem/CMEntityCollection.cs         | 2 +-
 .../Modules/ContentManagementSystem/ContentManagementEntity.cs    | 8 ++++----
 .../Environment/Modules/ContentManagementSystem/MetaEntity.cs     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/ContentManagementSystem')

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
         public AuraMetaEntity CreateAuraForNewlyCreatedEntity(SceneObjectPart part)
         {
             AuraMetaEntity ent = new AuraMetaEntity(part.ParentGroup.Scene,
-                                                    part.ParentGroup.Scene.PrimIDAllocate(),
+                                                    part.ParentGroup.Scene.AllocateLocalPrimId(),
                                                     part.GetWorldPosition(),
                                                     MetaEntity.TRANSLUCENT,
                                                     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
                         else
                         {
                             AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
-                                                                          m_Entity.Scene.PrimIDAllocate(),
+                                                                          m_Entity.Scene.AllocateLocalPrimId(),
                                                                           part.GetWorldPosition(),
                                                                           MetaEntity.TRANSLUCENT,
                                                                           new Vector3(254,0,0),
@@ -260,7 +260,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
                                 m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID);
                             }
                             BeamMetaEntity beamGroup = new BeamMetaEntity(m_Entity.Scene,
-                                                                          m_Entity.Scene.PrimIDAllocate(),
+                                                                          m_Entity.Scene.AllocateLocalPrimId(),
                                                                           m_UnchangedEntity.RootPart.GetWorldPosition(),
                                                                           MetaEntity.TRANSLUCENT,
                                                                           sceneEntityPart,
@@ -275,7 +275,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
                             m_AuraEntities.Remove(UnchangedPart.UUID);
                         }
                         AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
-                                                                      m_Entity.Scene.PrimIDAllocate(),
+                                                                      m_Entity.Scene.AllocateLocalPrimId(),
                                                                       UnchangedPart.GetWorldPosition(),
                                                                       MetaEntity.TRANSLUCENT,
                                                                       new Vector3(0,0,254),
@@ -309,7 +309,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
                         m_AuraEntities.Remove(UnchangedPart.UUID);
                     }
                     AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
-                                                                  m_Entity.Scene.PrimIDAllocate(),
+                                                                  m_Entity.Scene.AllocateLocalPrimId(),
                                                                   UnchangedPart.GetWorldPosition(),
                                                                   MetaEntity.TRANSLUCENT,
                                                                   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
 
             // make new localids
             foreach (SceneObjectPart part in m_Entity.Children.Values)
-                part.LocalId = m_Entity.Scene.PrimIDAllocate();
+                part.LocalId = m_Entity.Scene.AllocateLocalPrimId();
 
             //finalize
             m_Entity.RootPart.PhysActor = null;
-- 
cgit v1.1