aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMW2007-08-06 16:33:54 +0000
committerMW2007-08-06 16:33:54 +0000
commit4c9cc74ac263d1d99177e8024e51c86d826b9d7a (patch)
treec52df358eefc1686f361bbee168396f3ff3b1a8a /OpenSim/Region
parent* yet another mini-shape-commit (diff)
downloadopensim-SC_OLD-4c9cc74ac263d1d99177e8024e51c86d826b9d7a.zip
opensim-SC_OLD-4c9cc74ac263d1d99177e8024e51c86d826b9d7a.tar.gz
opensim-SC_OLD-4c9cc74ac263d1d99177e8024e51c86d826b9d7a.tar.bz2
opensim-SC_OLD-4c9cc74ac263d1d99177e8024e51c86d826b9d7a.tar.xz
Re-added Grid mode. (which had got removed/disabled in revision 1515)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/Application.cs16
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs14
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs3
3 files changed, 21 insertions, 12 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index b07a4d6..954d3c3 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -53,16 +53,16 @@ namespace OpenSim
53 53
54 Console.WriteLine("Starting...\n"); 54 Console.WriteLine("Starting...\n");
55 55
56 ArgvConfigSource source = new ArgvConfigSource(args); 56 ArgvConfigSource configSource = new ArgvConfigSource(args);
57 57
58 source.AddSwitch("Startup", "inifile"); 58 configSource.AddSwitch("Startup", "inifile");
59 source.AddSwitch("Startup", "configfile"); 59 configSource.AddSwitch("Startup", "configfile");
60 source.AddSwitch("Startup", "gridmode"); 60 configSource.AddSwitch("Startup", "gridmode");
61 source.AddSwitch("Startup", "physics"); 61 configSource.AddSwitch("Startup", "physics");
62 source.AddSwitch("Startup", "config"); 62 configSource.AddSwitch("Startup", "config");
63 source.AddSwitch("Startup", "noverbose"); 63 configSource.AddSwitch("Startup", "noverbose");
64 64
65 OpenSimMain sim = new OpenSimMain(source); 65 OpenSimMain sim = new OpenSimMain(configSource);
66 66
67 sim.StartUp(); 67 sim.StartUp();
68 68
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index e57ba27..248bd42 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -77,14 +77,14 @@ namespace OpenSim
77 string iniFile = startupSource.Configs["Startup"].GetString("inifile", "NA"); 77 string iniFile = startupSource.Configs["Startup"].GetString("inifile", "NA");
78 if (iniFile != "NA") 78 if (iniFile != "NA")
79 { 79 {
80 //a ini is set to be used for startup settings 80 //a INI file is set to be used for startup settings
81 string iniFilePath = Path.Combine(Util.configDir(), iniFile); 81 string iniFilePath = Path.Combine(Util.configDir(), iniFile);
82 if (File.Exists(iniFilePath)) 82 if (File.Exists(iniFilePath))
83 { 83 {
84 startupSource = new IniConfigSource(iniFilePath); 84 startupSource = new IniConfigSource(iniFilePath);
85 85
86 //enable follow line, if we want the original config source(normally commandline args) merged with ini file settings. 86 //enable follow line, if we want the original config source(normally commandline args) merged with ini file settings.
87 //in this case we have it so if both sources have the same named setting, command line value will overwrite the ini file value. 87 //in this case we have it so that if both sources have the same named setting, the command line value will overwrite the ini file value.
88 //(as if someone has bothered to enter a command line arg, we should take notice of it) 88 //(as if someone has bothered to enter a command line arg, we should take notice of it)
89 //startupSource.Merge(configSource); 89 //startupSource.Merge(configSource);
90 } 90 }
@@ -121,6 +121,15 @@ namespace OpenSim
121 m_httpServer.AddStreamHandler(new SimStatusHandler()); 121 m_httpServer.AddStreamHandler(new SimStatusHandler());
122 } 122 }
123 123
124 if (m_sandbox)
125 {
126 m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache);
127 }
128 else
129 {
130 m_commsManager = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache);
131 }
132
124 string regionConfigPath = Path.Combine(Util.configDir(), "Regions"); 133 string regionConfigPath = Path.Combine(Util.configDir(), "Regions");
125 134
126 if (!Directory.Exists(regionConfigPath)) 135 if (!Directory.Exists(regionConfigPath))
@@ -227,6 +236,7 @@ namespace OpenSim
227 } 236 }
228 237
229 #endregion 238 #endregion
239
230 /// <summary> 240 /// <summary>
231 /// Performs any last-minute sanity checking and shuts down the region server 241 /// Performs any last-minute sanity checking and shuts down the region server
232 /// </summary> 242 /// </summary>
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 5683b31..c67ae66 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -41,7 +41,6 @@ using libsecondlife;
41using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Environment.Scenes;
42using OpenSim.Framework.Communications; 42using OpenSim.Framework.Communications;
43using OpenSim.Framework.Communications.Caches; 43using OpenSim.Framework.Communications.Caches;
44using OpenSim.Region.Communications.Local;
45 44
46namespace OpenSim.Region.ClientStack 45namespace OpenSim.Region.ClientStack
47{ 46{
@@ -79,7 +78,7 @@ namespace OpenSim.Region.ClientStack
79 m_httpServer.Start(); 78 m_httpServer.Start();
80 79
81 m_inventoryCache = new InventoryCache(); 80 m_inventoryCache = new InventoryCache();
82 m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache); 81
83 } 82 }
84 83
85 protected abstract void Initialize(); 84 protected abstract void Initialize();