3 files changed, 6 insertions, 6 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
        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;

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;