diff options
| author | Justin Clarke Casey | 2008-11-07 21:50:03 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-11-07 21:50:03 +0000 |
| commit | fb694fb177a02199e6a4ff1f48f866d10e2ef29e (patch) | |
| tree | 7a5d39f7382cbc13031b7a6084b91bdc25f44fd9 /OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs | |
| parent | * Remove next local id from SceneBase (diff) | |
| download | opensim-SC-fb694fb177a02199e6a4ff1f48f866d10e2ef29e.zip opensim-SC-fb694fb177a02199e6a4ff1f48f866d10e2ef29e.tar.gz opensim-SC-fb694fb177a02199e6a4ff1f48f866d10e2ef29e.tar.bz2 opensim-SC-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/Modules/ContentManagementSystem/ContentManagementEntity.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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), |