diff options
author | Justin Clarke Casey | 2009-02-05 18:47:39 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-05 18:47:39 +0000 |
commit | 18100eee501d9fe02b078f02075eb6194128c16d (patch) | |
tree | 35a5c4109c7aaa87526c6f8f355cb899ea976a69 /OpenSim/Region | |
parent | * refactor: Move module handling code up into SceneBase from Scene, reducing ... (diff) | |
download | opensim-SC-18100eee501d9fe02b078f02075eb6194128c16d.zip opensim-SC-18100eee501d9fe02b078f02075eb6194128c16d.tar.gz opensim-SC-18100eee501d9fe02b078f02075eb6194128c16d.tar.bz2 opensim-SC-18100eee501d9fe02b078f02075eb6194128c16d.tar.xz |
* Remove unused region info list from OpenSimBase.
* The same information is available via SceneManager
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 561a8a2..1bd38ff 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -87,8 +87,7 @@ namespace OpenSim | |||
87 | 87 | ||
88 | protected GridInfoService m_gridInfoService; | 88 | protected GridInfoService m_gridInfoService; |
89 | 89 | ||
90 | protected List<IClientNetworkServer> m_clientServers = new List<IClientNetworkServer>(); | 90 | protected List<IClientNetworkServer> m_clientServers = new List<IClientNetworkServer>(); |
91 | protected List<RegionInfo> m_regionData = new List<RegionInfo>(); | ||
92 | 91 | ||
93 | public ConsoleCommand CreateAccount = null; | 92 | public ConsoleCommand CreateAccount = null; |
94 | 93 | ||
@@ -107,12 +106,7 @@ namespace OpenSim | |||
107 | public List<IClientNetworkServer> ClientServers | 106 | public List<IClientNetworkServer> ClientServers |
108 | { | 107 | { |
109 | get { return m_clientServers; } | 108 | get { return m_clientServers; } |
110 | } | 109 | } |
111 | |||
112 | public List<RegionInfo> RegionData | ||
113 | { | ||
114 | get { return m_regionData; } | ||
115 | } | ||
116 | 110 | ||
117 | public new BaseHttpServer HttpServer | 111 | public new BaseHttpServer HttpServer |
118 | { | 112 | { |
@@ -405,7 +399,6 @@ namespace OpenSim | |||
405 | m_sceneManager.Add(scene); | 399 | m_sceneManager.Add(scene); |
406 | 400 | ||
407 | m_clientServers.Add(clientServer); | 401 | m_clientServers.Add(clientServer); |
408 | m_regionData.Add(regionInfo); | ||
409 | clientServer.Start(); | 402 | clientServer.Start(); |
410 | 403 | ||
411 | if (do_post_init) | 404 | if (do_post_init) |
@@ -430,7 +423,6 @@ namespace OpenSim | |||
430 | } | 423 | } |
431 | 424 | ||
432 | scene.DeleteAllSceneObjects(); | 425 | scene.DeleteAllSceneObjects(); |
433 | m_regionData.Remove(scene.RegionInfo); | ||
434 | m_sceneManager.CloseScene(scene); | 426 | m_sceneManager.CloseScene(scene); |
435 | 427 | ||
436 | if (!cleanup) | 428 | if (!cleanup) |
@@ -500,20 +492,6 @@ namespace OpenSim | |||
500 | m_clientServers.RemoveAt(clientServerElement); | 492 | m_clientServers.RemoveAt(clientServerElement); |
501 | } | 493 | } |
502 | 494 | ||
503 | //Removing the region from the sim's database of regions.. | ||
504 | int RegionHandleElement = -1; | ||
505 | for (int i = 0; i < m_regionData.Count; i++) | ||
506 | { | ||
507 | if (whichRegion.RegionHandle == m_regionData[i].RegionHandle) | ||
508 | { | ||
509 | RegionHandleElement = i; | ||
510 | } | ||
511 | } | ||
512 | if (RegionHandleElement >= 0) | ||
513 | { | ||
514 | m_regionData.RemoveAt(RegionHandleElement); | ||
515 | } | ||
516 | |||
517 | CreateRegion(whichRegion, true); | 495 | CreateRegion(whichRegion, true); |
518 | } | 496 | } |
519 | 497 | ||