diff options
author | Justin Clarke Casey | 2008-11-07 22:08:58 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-07 22:08:58 +0000 |
commit | ba1d9ca26b7b5e865824e16dc8930e85ef27eb54 (patch) | |
tree | f294fd0129360fef926a7ebd610adf4b7b813afa /OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs | |
parent | * Rename PrimIDAllocate() to more effectively convey what it does, and put th... (diff) | |
download | opensim-SC_OLD-ba1d9ca26b7b5e865824e16dc8930e85ef27eb54.zip opensim-SC_OLD-ba1d9ca26b7b5e865824e16dc8930e85ef27eb54.tar.gz opensim-SC_OLD-ba1d9ca26b7b5e865824e16dc8930e85ef27eb54.tar.bz2 opensim-SC_OLD-ba1d9ca26b7b5e865824e16dc8930e85ef27eb54.tar.xz |
* refactor: cleanup AllocateLocalPrimId() a bit more
Diffstat (limited to 'OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs index ac2af34..d0b5929 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs | |||
@@ -153,7 +153,6 @@ 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.AllocateLocalPrimId(), | ||
157 | part.GetWorldPosition(), | 156 | part.GetWorldPosition(), |
158 | MetaEntity.TRANSLUCENT, | 157 | MetaEntity.TRANSLUCENT, |
159 | new Vector3(254,0,0), | 158 | new Vector3(254,0,0), |
@@ -260,7 +259,6 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
260 | m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID); | 259 | m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID); |
261 | } | 260 | } |
262 | BeamMetaEntity beamGroup = new BeamMetaEntity(m_Entity.Scene, | 261 | BeamMetaEntity beamGroup = new BeamMetaEntity(m_Entity.Scene, |
263 | m_Entity.Scene.AllocateLocalPrimId(), | ||
264 | m_UnchangedEntity.RootPart.GetWorldPosition(), | 262 | m_UnchangedEntity.RootPart.GetWorldPosition(), |
265 | MetaEntity.TRANSLUCENT, | 263 | MetaEntity.TRANSLUCENT, |
266 | sceneEntityPart, | 264 | sceneEntityPart, |
@@ -275,7 +273,6 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
275 | m_AuraEntities.Remove(UnchangedPart.UUID); | 273 | m_AuraEntities.Remove(UnchangedPart.UUID); |
276 | } | 274 | } |
277 | AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene, | 275 | AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene, |
278 | m_Entity.Scene.AllocateLocalPrimId(), | ||
279 | UnchangedPart.GetWorldPosition(), | 276 | UnchangedPart.GetWorldPosition(), |
280 | MetaEntity.TRANSLUCENT, | 277 | MetaEntity.TRANSLUCENT, |
281 | new Vector3(0,0,254), | 278 | new Vector3(0,0,254), |
@@ -309,7 +306,6 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
309 | m_AuraEntities.Remove(UnchangedPart.UUID); | 306 | m_AuraEntities.Remove(UnchangedPart.UUID); |
310 | } | 307 | } |
311 | AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene, | 308 | AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene, |
312 | m_Entity.Scene.AllocateLocalPrimId(), | ||
313 | UnchangedPart.GetWorldPosition(), | 309 | UnchangedPart.GetWorldPosition(), |
314 | MetaEntity.TRANSLUCENT, | 310 | MetaEntity.TRANSLUCENT, |
315 | new Vector3(254,0,0), | 311 | new Vector3(254,0,0), |
@@ -317,7 +313,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
317 | ); | 313 | ); |
318 | m_AuraEntities.Add(UnchangedPart.UUID, auraGroup); | 314 | m_AuraEntities.Add(UnchangedPart.UUID, auraGroup); |
319 | SetPartTransparency(metaEntityPart, MetaEntity.TRANSLUCENT); | 315 | SetPartTransparency(metaEntityPart, MetaEntity.TRANSLUCENT); |
320 | 316 | ||
321 | DiffersFromSceneGroup = true; | 317 | DiffersFromSceneGroup = true; |
322 | } | 318 | } |
323 | } | 319 | } |