ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Rename PrimIDAllocate() to more effectively convey what it does, and put the verb at the front

Browse Source
This commit is contained in:
Justin Clarke Casey
2008-11-07 21:50:03 +00:00
parent 47e3d4d1f0
commit fb694fb177
6 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs
View File

@@ -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),

8
OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
View File

@@ -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),

2
OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
View File

@@ -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;