aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs37
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObject.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs2
3 files changed, 27 insertions, 14 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 6a4b735..01e6752 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -68,10 +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 EstateManager estateManager;
72 public EventManager eventManager;
73 public ScriptManager scriptManager;
74
75 #region Properties 71 #region Properties
76 /// <summary> 72 /// <summary>
77 /// 73 ///
@@ -89,12 +85,29 @@ namespace OpenSim.Region.Environment.Scenes
89 } 85 }
90 86
91 private ParcelManager m_parcelManager; 87 private ParcelManager m_parcelManager;
92
93 public ParcelManager ParcelManager 88 public ParcelManager ParcelManager
94 { 89 {
95 get { return m_parcelManager; } 90 get { return m_parcelManager; }
96 } 91 }
97 92
93 private EstateManager m_estateManager;
94 public EstateManager EstateManager
95 {
96 get { return m_estateManager; }
97 }
98
99 private EventManager m_eventManager;
100 public EventManager EventManager
101 {
102 get { return m_eventManager; }
103 }
104
105 private ScriptManager m_scriptManager;
106 public ScriptManager ScriptManager
107 {
108 get { return m_scriptManager; }
109 }
110
98 #endregion 111 #endregion
99 112
100 #region Constructors 113 #region Constructors
@@ -118,9 +131,9 @@ namespace OpenSim.Region.Environment.Scenes
118 this.RegisterRegionWithComms(); 131 this.RegisterRegionWithComms();
119 132
120 m_parcelManager = new ParcelManager(this, this.m_regInfo); 133 m_parcelManager = new ParcelManager(this, this.m_regInfo);
121 estateManager = new EstateManager(this, this.m_regInfo); 134 m_estateManager = new EstateManager(this, this.m_regInfo);
122 scriptManager = new ScriptManager(this); 135 m_scriptManager = new ScriptManager(this);
123 eventManager = new EventManager(); 136 m_eventManager = new EventManager();
124 137
125 MainLog.Instance.Verbose("World.cs - creating new entitities instance"); 138 MainLog.Instance.Verbose("World.cs - creating new entitities instance");
126 Entities = new Dictionary<LLUUID, EntityBase>(); 139 Entities = new Dictionary<LLUUID, EntityBase>();
@@ -189,7 +202,7 @@ namespace OpenSim.Region.Environment.Scenes
189 } 202 }
190 203
191 // General purpose event manager 204 // General purpose event manager
192 eventManager.TriggerOnFrame(); 205 m_eventManager.TriggerOnFrame();
193 206
194 //backup world data 207 //backup world data
195 this.storageCount++; 208 this.storageCount++;
@@ -453,7 +466,7 @@ namespace OpenSim.Region.Environment.Scenes
453 public override void AddNewClient(IClientAPI client, bool child) 466 public override void AddNewClient(IClientAPI client, bool child)
454 { 467 {
455 SubscribeToClientEvents(client); 468 SubscribeToClientEvents(client);
456 this.estateManager.sendRegionHandshake(client); 469 this.m_estateManager.sendRegionHandshake(client);
457 CreateAndAddScenePresence(client); 470 CreateAndAddScenePresence(client);
458 this.m_parcelManager.sendParcelOverlay(client); 471 this.m_parcelManager.sendParcelOverlay(client);
459 472
@@ -489,7 +502,7 @@ namespace OpenSim.Region.Environment.Scenes
489 client.OnParcelDivideRequest += new ParcelDivideRequest(m_parcelManager.handleParcelDivideRequest); 502 client.OnParcelDivideRequest += new ParcelDivideRequest(m_parcelManager.handleParcelDivideRequest);
490 client.OnParcelJoinRequest += new ParcelJoinRequest(m_parcelManager.handleParcelJoinRequest); 503 client.OnParcelJoinRequest += new ParcelJoinRequest(m_parcelManager.handleParcelJoinRequest);
491 client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(m_parcelManager.handleParcelPropertiesUpdateRequest); 504 client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(m_parcelManager.handleParcelPropertiesUpdateRequest);
492 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); 505 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage);
493 506
494 } 507 }
495 508
@@ -541,7 +554,7 @@ namespace OpenSim.Region.Environment.Scenes
541 /// <param name="agentID"></param> 554 /// <param name="agentID"></param>
542 public override void RemoveClient(LLUUID agentID) 555 public override void RemoveClient(LLUUID agentID)
543 { 556 {
544 eventManager.TriggerOnRemovePresence(agentID); 557 m_eventManager.TriggerOnRemovePresence(agentID);
545 558
546 ScenePresence avatar = this.RequestAvatar(agentID); 559 ScenePresence avatar = this.RequestAvatar(agentID);
547 560
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 7058ece..d1a3e70 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Environment.Scenes
76 this.CreateRootFromShape(ownerID, localID, shape, pos); 76 this.CreateRootFromShape(ownerID, localID, shape, pos);
77 77
78 // Setup a backup event listener 78 // Setup a backup event listener
79 world.eventManager.OnBackup += new EventManager.OnBackupDelegate(ProcessBackup); 79 world.EventManager.OnBackup += new EventManager.OnBackupDelegate(ProcessBackup);
80 } 80 }
81 81
82 /// <summary> 82 /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
index e1f711e..c3be22a 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Scripting
50 public ScriptInfo(Scene scene) 50 public ScriptInfo(Scene scene)
51 { 51 {
52 world = scene; 52 world = scene;
53 events = world.eventManager; 53 events = world.EventManager;
54 logger = MainLog.Instance; 54 logger = MainLog.Instance;
55 api = new ScriptAPI(scene); 55 api = new ScriptAPI(scene);
56 } 56 }