aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-05 18:36:53 +0000
committerJustin Clarke Casey2009-02-05 18:36:53 +0000
commitd04025ff3dd6208a8939c320e15cc0182e045b05 (patch)
treeca26ec998d4803ece3f16c9e83d66afd56874a91 /OpenSim/Region/Application/OpenSimBase.cs
parentFrom: Christopher Yeoh <yeohc@au1.ibm.com> (diff)
downloadopensim-SC_OLD-d04025ff3dd6208a8939c320e15cc0182e045b05.zip
opensim-SC_OLD-d04025ff3dd6208a8939c320e15cc0182e045b05.tar.gz
opensim-SC_OLD-d04025ff3dd6208a8939c320e15cc0182e045b05.tar.bz2
opensim-SC_OLD-d04025ff3dd6208a8939c320e15cc0182e045b05.tar.xz
* refactor: Move module handling code up into SceneBase from Scene, reducing the large number of different things that Scene does
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs19
1 files changed, 8 insertions, 11 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index ec40384..561a8a2 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -52,7 +52,7 @@ using OpenSim.Region.Physics.Manager;
52namespace OpenSim 52namespace OpenSim
53{ 53{
54 /// <summary> 54 /// <summary>
55 /// Common OpenSim region service code 55 /// Common OpenSim simulator code
56 /// </summary> 56 /// </summary>
57 public class OpenSimBase : RegionApplicationBase 57 public class OpenSimBase : RegionApplicationBase
58 { 58 {
@@ -75,14 +75,13 @@ namespace OpenSim
75 /// The file to load and save inventory if no filename has been specified 75 /// The file to load and save inventory if no filename has been specified
76 /// </summary> 76 /// </summary>
77 protected const string DEFAULT_INV_BACKUP_FILENAME = "opensim_inv.tar.gz"; 77 protected const string DEFAULT_INV_BACKUP_FILENAME = "opensim_inv.tar.gz";
78 78
79 protected ConfigSettings m_configSettings;
80
81 public ConfigSettings ConfigurationSettings 79 public ConfigSettings ConfigurationSettings
82 { 80 {
83 get { return m_configSettings; } 81 get { return m_configSettings; }
84 set { m_configSettings = value; } 82 set { m_configSettings = value; }
85 } 83 }
84 protected ConfigSettings m_configSettings;
86 85
87 protected ConfigurationLoader m_configLoader; 86 protected ConfigurationLoader m_configLoader;
88 87
@@ -123,15 +122,14 @@ namespace OpenSim
123 public uint HttpServerPort 122 public uint HttpServerPort
124 { 123 {
125 get { return m_httpServerPort; } 124 get { return m_httpServerPort; }
126 } 125 }
127
128 protected ModuleLoader m_moduleLoader;
129 126
130 public ModuleLoader ModuleLoader 127 public ModuleLoader ModuleLoader
131 { 128 {
132 get { return m_moduleLoader; } 129 get { return m_moduleLoader; }
133 set { m_moduleLoader = value; } 130 set { m_moduleLoader = value; }
134 } 131 }
132 protected ModuleLoader m_moduleLoader;
135 133
136 /// <summary> 134 /// <summary>
137 /// Constructor. 135 /// Constructor.
@@ -441,7 +439,7 @@ namespace OpenSim
441 if (!String.IsNullOrEmpty(scene.RegionInfo.RegionFile)) 439 if (!String.IsNullOrEmpty(scene.RegionInfo.RegionFile))
442 { 440 {
443 File.Delete(scene.RegionInfo.RegionFile); 441 File.Delete(scene.RegionInfo.RegionFile);
444 m_log.InfoFormat("[OPENSIM MAIN] deleting region file \"{0}\"", scene.RegionInfo.RegionFile); 442 m_log.InfoFormat("[OPENSIM]: deleting region file \"{0}\"", scene.RegionInfo.RegionFile);
445 } 443 }
446 } 444 }
447 445
@@ -480,7 +478,7 @@ namespace OpenSim
480 478
481 public void handleRestartRegion(RegionInfo whichRegion) 479 public void handleRestartRegion(RegionInfo whichRegion)
482 { 480 {
483 m_log.Error("[OPENSIM MAIN]: Got restart signal from SceneManager"); 481 m_log.Info("[OPENSIM]: Got restart signal from SceneManager");
484 482
485 // Shutting down the client server 483 // Shutting down the client server
486 bool foundClientServer = false; 484 bool foundClientServer = false;
@@ -488,8 +486,6 @@ namespace OpenSim
488 486
489 for (int i = 0; i < m_clientServers.Count; i++) 487 for (int i = 0; i < m_clientServers.Count; i++)
490 { 488 {
491 //--> Melanie, the following needs to be fixed
492 // the Equals override is not returning true if the locations are actually equal
493 if (m_clientServers[i].HandlesRegion(new Location(whichRegion.RegionHandle))) 489 if (m_clientServers[i].HandlesRegion(new Location(whichRegion.RegionHandle)))
494 { 490 {
495 clientServerElement = i; 491 clientServerElement = i;
@@ -497,6 +493,7 @@ namespace OpenSim
497 break; 493 break;
498 } 494 }
499 } 495 }
496
500 if (foundClientServer) 497 if (foundClientServer)
501 { 498 {
502 m_clientServers[clientServerElement].Server.Close(); 499 m_clientServers[clientServerElement].Server.Close();