aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
authorTeravus Ovares2007-11-21 02:17:24 +0000
committerTeravus Ovares2007-11-21 02:17:24 +0000
commit7cb38712d5ad6781e672e4f1c8500ecd88d85f3e (patch)
tree5203c9901fdbba5ec8d9a21880d7895f593af540 /OpenSim/Region/Application/OpenSimMain.cs
parentfix for mantis #2 from Justin Casey (IBM) (diff)
downloadopensim-SC-7cb38712d5ad6781e672e4f1c8500ecd88d85f3e.zip
opensim-SC-7cb38712d5ad6781e672e4f1c8500ecd88d85f3e.tar.gz
opensim-SC-7cb38712d5ad6781e672e4f1c8500ecd88d85f3e.tar.bz2
opensim-SC-7cb38712d5ad6781e672e4f1c8500ecd88d85f3e.tar.xz
* Did some initial work for prim crossing. Just glue so far.
* Added the child_get_tasks OpenSim.ini flag for testing the UDP packet sending code and packet throttler. This flag gets purposely disabled in grid mode. This flag also has the consequence that you can see the prim in neighboring regions without going into them. Be warned, this causes tons of dropped packets.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs19
1 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index eb09de3..11345c3 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -59,6 +59,7 @@ namespace OpenSim
59 public bool m_sandbox; 59 public bool m_sandbox;
60 public bool user_accounts; 60 public bool user_accounts;
61 public bool m_gridLocalAsset; 61 public bool m_gridLocalAsset;
62 public bool m_SendChildAgentTaskData;
62 63
63 private OpenSimController m_controller; 64 private OpenSimController m_controller;
64 65
@@ -156,6 +157,9 @@ namespace OpenSim
156 config.Set("physics", "basicphysics"); 157 config.Set("physics", "basicphysics");
157 config.Set("verbose", true); 158 config.Set("verbose", true);
158 config.Set("physical_prim", true); 159 config.Set("physical_prim", true);
160
161 config.Set("child_get_tasks", false);
162
159 config.Set("serverside_object_permissions", false); 163 config.Set("serverside_object_permissions", false);
160 164
161 config.Set("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); 165 config.Set("storage_plugin", "OpenSim.DataStore.NullStorage.dll");
@@ -166,6 +170,7 @@ namespace OpenSim
166 config.Set("script_engine", "DotNetEngine"); 170 config.Set("script_engine", "DotNetEngine");
167 171
168 config.Set("asset_database", "sqlite"); 172 config.Set("asset_database", "sqlite");
173
169 } 174 }
170 175
171 if (m_config.Configs["StandAlone"] == null) 176 if (m_config.Configs["StandAlone"] == null)
@@ -215,7 +220,11 @@ namespace OpenSim
215 m_physicsEngine = startupConfig.GetString("physics", "basicphysics"); 220 m_physicsEngine = startupConfig.GetString("physics", "basicphysics");
216 m_meshEngineName = startupConfig.GetString("meshing", "ZeroMesher"); 221 m_meshEngineName = startupConfig.GetString("meshing", "ZeroMesher");
217 m_verbose = startupConfig.GetBoolean("verbose", true); 222 m_verbose = startupConfig.GetBoolean("verbose", true);
223
218 m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); 224 m_physicalPrim = startupConfig.GetBoolean("physical_prim", true);
225
226 m_SendChildAgentTaskData = startupConfig.GetBoolean("child_get_tasks", false);
227
219 m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); 228 m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false);
220 229
221 m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); 230 m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll");
@@ -243,7 +252,10 @@ namespace OpenSim
243 252
244 m_dumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false); 253 m_dumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false);
245 } 254 }
255 if (!m_sandbox)
256 m_SendChildAgentTaskData = false;
246 257
258
247 m_networkServersInfo.loadFromConfiguration(m_config); 259 m_networkServersInfo.loadFromConfiguration(m_config);
248 } 260 }
249 261
@@ -368,9 +380,14 @@ namespace OpenSim
368 { 380 {
369 PermissionManager permissionManager = new PermissionManager(); 381 PermissionManager permissionManager = new PermissionManager();
370 SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); 382 SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager);
383 if (m_SendChildAgentTaskData)
384 {
385 MainLog.Instance.Error("WARNING", "Send Child Agent Task Updates is enabled. This is for testing only. It doesn't work on grid mode!");
386 System.Threading.Thread.Sleep(12000);
387 }
371 return 388 return
372 new Scene(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService, m_assetCache, storageManager, m_httpServer, 389 new Scene(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService, m_assetCache, storageManager, m_httpServer,
373 m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim); 390 m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_SendChildAgentTaskData);
374 } 391 }
375 392
376 protected override void Initialize() 393 protected override void Initialize()