aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
authorTeravus Ovares2007-11-11 00:08:18 +0000
committerTeravus Ovares2007-11-11 00:08:18 +0000
commitec77e1eb17f032458dbe93c0a1eab5aee604112f (patch)
tree002992e71a443d80b44ebcbf497dfe17ce7a1625 /OpenSim/Region/Application/OpenSimMain.cs
parentremoved OdePlugin/Meshing directory (diff)
downloadopensim-SC-ec77e1eb17f032458dbe93c0a1eab5aee604112f.zip
opensim-SC-ec77e1eb17f032458dbe93c0a1eab5aee604112f.tar.gz
opensim-SC-ec77e1eb17f032458dbe93c0a1eab5aee604112f.tar.bz2
opensim-SC-ec77e1eb17f032458dbe93c0a1eab5aee604112f.tar.xz
* adds flag in OpenSim.ini for disabling physical prim. Look at OpenSim.ini.example in the bin folder for an example.
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 42f1b94..e3c326b 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -73,6 +73,7 @@ namespace OpenSim
73 protected List<RegionInfo> m_regionData = new List<RegionInfo>(); 73 protected List<RegionInfo> m_regionData = new List<RegionInfo>();
74 74
75 private bool m_verbose; 75 private bool m_verbose;
76 private bool m_physicalPrim;
76 private readonly string m_logFilename = ("region-console.log"); 77 private readonly string m_logFilename = ("region-console.log");
77 private bool m_permissions = false; 78 private bool m_permissions = false;
78 79
@@ -154,6 +155,7 @@ namespace OpenSim
154 config.Set("gridmode", false); 155 config.Set("gridmode", false);
155 config.Set("physics", "basicphysics"); 156 config.Set("physics", "basicphysics");
156 config.Set("verbose", true); 157 config.Set("verbose", true);
158 config.Set("physical_prim", true);
157 config.Set("serverside_object_permissions", false); 159 config.Set("serverside_object_permissions", false);
158 160
159 config.Set("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); 161 config.Set("storage_plugin", "OpenSim.DataStore.NullStorage.dll");
@@ -213,6 +215,7 @@ namespace OpenSim
213 m_physicsEngine = startupConfig.GetString("physics", "basicphysics"); 215 m_physicsEngine = startupConfig.GetString("physics", "basicphysics");
214 m_meshEngineName = startupConfig.GetString("meshing", "Meshmerizer"); 216 m_meshEngineName = startupConfig.GetString("meshing", "Meshmerizer");
215 m_verbose = startupConfig.GetBoolean("verbose", true); 217 m_verbose = startupConfig.GetBoolean("verbose", true);
218 m_physicalPrim = startupConfig.GetBoolean("physical_prim", true);
216 m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); 219 m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false);
217 220
218 m_storageDLL = startupConfig.GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); 221 m_storageDLL = startupConfig.GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll");
@@ -365,7 +368,7 @@ namespace OpenSim
365 SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); 368 SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager);
366 return 369 return
367 new Scene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, storageManager, m_httpServer, 370 new Scene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, storageManager, m_httpServer,
368 m_moduleLoader, m_dumpAssetsToFile); 371 m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim);
369 } 372 }
370 373
371 protected override void Initialize() 374 protected override void Initialize()