aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs2
-rw-r--r--OpenSim/Region/Environment/ParcelManager.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs22
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs3
4 files changed, 19 insertions, 10 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 48997e2..8367fd0 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -230,7 +230,7 @@ namespace OpenSim
230 if (masterAvatar != null) 230 if (masterAvatar != null)
231 { 231 {
232 LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; 232 LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
233 LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager); 233 LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.ParcelManager);
234 } 234 }
235 235
236 LocalWorld.StartTimer(); 236 LocalWorld.StartTimer();
diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 07f39fd..b9c4067 100644
--- a/OpenSim/Region/Environment/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -664,7 +664,7 @@ namespace OpenSim.Region.Environment
664 List<Avatar> avatars = m_world.RequestAvatarList(); 664 List<Avatar> avatars = m_world.RequestAvatarList();
665 for (int i = 0; i < avatars.Count; i++) 665 for (int i = 0; i < avatars.Count; i++)
666 { 666 {
667 Parcel over = m_world.parcelManager.getParcel((int)Math.Round(avatars[i].Pos.X), (int)Math.Round(avatars[i].Pos.Y)); 667 Parcel over = m_world.ParcelManager.getParcel((int)Math.Round(avatars[i].Pos.X), (int)Math.Round(avatars[i].Pos.Y));
668 if (over.parcelData.localID == this.parcelData.localID) 668 if (over.parcelData.localID == this.parcelData.localID)
669 { 669 {
670 sendParcelProperties(0, false, 0, avatars[i].ControllingClient); 670 sendParcelProperties(0, false, 0, avatars[i].ControllingClient);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 737e8fe..6a4b735 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -68,7 +68,6 @@ namespace OpenSim.Region.Environment.Scenes
68 protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); 68 protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>();
69 protected BaseHttpServer httpListener; 69 protected BaseHttpServer httpListener;
70 70
71 public ParcelManager parcelManager;
72 public EstateManager estateManager; 71 public EstateManager estateManager;
73 public EventManager eventManager; 72 public EventManager eventManager;
74 public ScriptManager scriptManager; 73 public ScriptManager scriptManager;
@@ -89,6 +88,13 @@ namespace OpenSim.Region.Environment.Scenes
89 } 88 }
90 } 89 }
91 90
91 private ParcelManager m_parcelManager;
92
93 public ParcelManager ParcelManager
94 {
95 get { return m_parcelManager; }
96 }
97
92 #endregion 98 #endregion
93 99
94 #region Constructors 100 #region Constructors
@@ -111,7 +117,7 @@ namespace OpenSim.Region.Environment.Scenes
111 this.m_datastore = m_regInfo.DataStore; 117 this.m_datastore = m_regInfo.DataStore;
112 this.RegisterRegionWithComms(); 118 this.RegisterRegionWithComms();
113 119
114 parcelManager = new ParcelManager(this, this.m_regInfo); 120 m_parcelManager = new ParcelManager(this, this.m_regInfo);
115 estateManager = new EstateManager(this, this.m_regInfo); 121 estateManager = new EstateManager(this, this.m_regInfo);
116 scriptManager = new ScriptManager(this); 122 scriptManager = new ScriptManager(this);
117 eventManager = new EventManager(); 123 eventManager = new EventManager();
@@ -449,7 +455,7 @@ namespace OpenSim.Region.Environment.Scenes
449 SubscribeToClientEvents(client); 455 SubscribeToClientEvents(client);
450 this.estateManager.sendRegionHandshake(client); 456 this.estateManager.sendRegionHandshake(client);
451 CreateAndAddScenePresence(client); 457 CreateAndAddScenePresence(client);
452 this.parcelManager.sendParcelOverlay(client); 458 this.m_parcelManager.sendParcelOverlay(client);
453 459
454 } 460 }
455 461
@@ -479,10 +485,10 @@ namespace OpenSim.Region.Environment.Scenes
479 client.OnLinkObjects += this.LinkObjects; 485 client.OnLinkObjects += this.LinkObjects;
480 client.OnObjectDuplicate += this.DuplicateObject; 486 client.OnObjectDuplicate += this.DuplicateObject;
481 487
482 client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); 488 client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(m_parcelManager.handleParcelPropertiesRequest);
483 client.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); 489 client.OnParcelDivideRequest += new ParcelDivideRequest(m_parcelManager.handleParcelDivideRequest);
484 client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest); 490 client.OnParcelJoinRequest += new ParcelJoinRequest(m_parcelManager.handleParcelJoinRequest);
485 client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest); 491 client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(m_parcelManager.handleParcelPropertiesUpdateRequest);
486 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); 492 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
487 493
488 } 494 }
@@ -524,7 +530,7 @@ namespace OpenSim.Region.Environment.Scenes
524 this.Avatars.Add(client.AgentId, newAvatar); 530 this.Avatars.Add(client.AgentId, newAvatar);
525 } 531 }
526 } 532 }
527 newAvatar.OnSignificantClientMovement += parcelManager.handleSignificantClientMovement; 533 newAvatar.OnSignificantClientMovement += m_parcelManager.handleSignificantClientMovement;
528 return newAvatar; 534 return newAvatar;
529 } 535 }
530 536
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 3723c3d..42036eb 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -60,7 +60,10 @@ namespace SimpleApp
60 60
61 world = new MyWorld(packetServer.ClientManager, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer); 61 world = new MyWorld(packetServer.ClientManager, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);
62 world.PhysScene = physManager.GetPhysicsScene("basicphysics"); //PhysicsScene.Null; 62 world.PhysScene = physManager.GetPhysicsScene("basicphysics"); //PhysicsScene.Null;
63
63 world.LoadWorldMap(); 64 world.LoadWorldMap();
65 world.ParcelManager.NoParcelDataFromStorage();
66
64 udpServer.LocalWorld = world; 67 udpServer.LocalWorld = world;
65 68
66 httpServer.Start(); 69 httpServer.Start();