diff options
Start of replacing the old SceneObject/Primitive classes with the new versions.
PLEASE NOTE: that with this revision some prim related features may be broke for a while. (things like linking prims and the parcel prim count.)
Also this revision may not work on mono, but that will be fixed soon.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 813308b..c2eac60 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -54,7 +54,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
54 | { | 54 | { |
55 | protected Timer m_heartbeatTimer = new Timer(); | 55 | protected Timer m_heartbeatTimer = new Timer(); |
56 | protected Dictionary<LLUUID, ScenePresence> Avatars; | 56 | protected Dictionary<LLUUID, ScenePresence> Avatars; |
57 | protected Dictionary<LLUUID, SceneObject> Prims; | 57 | protected Dictionary<LLUUID, SceneObjectGroup> Prims; |
58 | protected PhysicsScene phyScene; | 58 | protected PhysicsScene phyScene; |
59 | protected float timeStep = 0.1f; | 59 | protected float timeStep = 0.1f; |
60 | private Random Rand = new Random(); | 60 | private Random Rand = new Random(); |
@@ -109,7 +109,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
109 | get { return m_scriptManager; } | 109 | get { return m_scriptManager; } |
110 | } | 110 | } |
111 | 111 | ||
112 | public Dictionary<LLUUID, SceneObject> Objects | 112 | public Dictionary<LLUUID, SceneObjectGroup> Objects |
113 | { | 113 | { |
114 | get { return Prims; } | 114 | get { return Prims; } |
115 | } | 115 | } |
@@ -149,11 +149,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
149 | MainLog.Instance.Verbose("Creating new entitities instance"); | 149 | MainLog.Instance.Verbose("Creating new entitities instance"); |
150 | Entities = new Dictionary<LLUUID, EntityBase>(); | 150 | Entities = new Dictionary<LLUUID, EntityBase>(); |
151 | Avatars = new Dictionary<LLUUID, ScenePresence>(); | 151 | Avatars = new Dictionary<LLUUID, ScenePresence>(); |
152 | Prims = new Dictionary<LLUUID, SceneObject>(); | 152 | Prims = new Dictionary<LLUUID, SceneObjectGroup>(); |
153 | 153 | ||
154 | MainLog.Instance.Verbose("Loading objects from datastore"); | 154 | MainLog.Instance.Verbose("Loading objects from datastore"); |
155 | List<SceneObject> PrimsFromDB = storageManager.DataStore.LoadObjects(); | 155 | List<SceneObjectGroup> PrimsFromDB = storageManager.DataStore.LoadObjects(); |
156 | foreach (SceneObject prim in PrimsFromDB) | 156 | foreach (SceneObjectGroup prim in PrimsFromDB) |
157 | { | 157 | { |
158 | AddEntity(prim); | 158 | AddEntity(prim); |
159 | } | 159 | } |
@@ -463,10 +463,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
463 | public void LoadPrimsFromStorage() | 463 | public void LoadPrimsFromStorage() |
464 | { | 464 | { |
465 | MainLog.Instance.Verbose("World.cs: LoadPrimsFromStorage() - Loading primitives"); | 465 | MainLog.Instance.Verbose("World.cs: LoadPrimsFromStorage() - Loading primitives"); |
466 | List<SceneObject> NewObjectsList = storageManager.DataStore.LoadObjects(); | 466 | List<SceneObjectGroup> NewObjectsList = storageManager.DataStore.LoadObjects(); |
467 | foreach (SceneObject obj in NewObjectsList) | 467 | foreach (SceneObjectGroup obj in NewObjectsList) |
468 | { | 468 | { |
469 | this.Objects.Add(obj.rootUUID, obj); | 469 | this.Objects.Add(obj.UUID, obj); |
470 | } | 470 | } |
471 | } | 471 | } |
472 | 472 | ||
@@ -501,7 +501,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
501 | /// <param name="ownerID"></param> | 501 | /// <param name="ownerID"></param> |
502 | public void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape) | 502 | public void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape) |
503 | { | 503 | { |
504 | SceneObject sceneOb = new SceneObject(this, m_eventManager, ownerID, PrimIDAllocate(), pos, shape); | 504 | SceneObjectGroup sceneOb = new SceneObjectGroup(this, this.m_regionHandle, ownerID, PrimIDAllocate(), pos, shape); |
505 | AddEntity(sceneOb); | 505 | AddEntity(sceneOb); |
506 | } | 506 | } |
507 | 507 | ||
@@ -509,28 +509,28 @@ namespace OpenSim.Region.Environment.Scenes | |||
509 | { | 509 | { |
510 | foreach (EntityBase obj in Entities.Values) | 510 | foreach (EntityBase obj in Entities.Values) |
511 | { | 511 | { |
512 | if (obj is SceneObject) | 512 | if (obj is SceneObjectGroup) |
513 | { | 513 | { |
514 | if (((SceneObject) obj).LocalId == localID) | 514 | if (((SceneObjectGroup) obj).LocalId == localID) |
515 | { | 515 | { |
516 | RemoveEntity((SceneObject) obj); | 516 | RemoveEntity((SceneObjectGroup) obj); |
517 | return; | 517 | return; |
518 | } | 518 | } |
519 | } | 519 | } |
520 | } | 520 | } |
521 | } | 521 | } |
522 | 522 | ||
523 | public void AddEntity(SceneObject sceneObject) | 523 | public void AddEntity(SceneObjectGroup sceneObject) |
524 | { | 524 | { |
525 | Entities.Add(sceneObject.rootUUID, sceneObject); | 525 | Entities.Add(sceneObject.UUID, sceneObject); |
526 | } | 526 | } |
527 | 527 | ||
528 | public void RemoveEntity(SceneObject sceneObject) | 528 | public void RemoveEntity(SceneObjectGroup sceneObject) |
529 | { | 529 | { |
530 | if (Entities.ContainsKey(sceneObject.rootUUID)) | 530 | if (Entities.ContainsKey(sceneObject.UUID)) |
531 | { | 531 | { |
532 | m_LandManager.removePrimFromLandPrimCounts(sceneObject); | 532 | m_LandManager.removePrimFromLandPrimCounts(sceneObject); |
533 | Entities.Remove(sceneObject.rootUUID); | 533 | Entities.Remove(sceneObject.UUID); |
534 | m_LandManager.setPrimsTainted(); | 534 | m_LandManager.setPrimsTainted(); |
535 | } | 535 | } |
536 | } | 536 | } |
@@ -779,9 +779,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
779 | { | 779 | { |
780 | foreach (EntityBase ent in Entities.Values) | 780 | foreach (EntityBase ent in Entities.Values) |
781 | { | 781 | { |
782 | if (ent is SceneObject) | 782 | if (ent is SceneObjectGroup) |
783 | { | 783 | { |
784 | ((SceneObject) ent).SendAllChildPrimsToClient(client); | 784 | // ((SceneObject) ent).SendAllChildPrimsToClient(client); |
785 | } | 785 | } |
786 | } | 786 | } |
787 | } | 787 | } |