diff options
author | Justin Clarke Casey | 2008-05-05 20:14:53 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-05 20:14:53 +0000 |
commit | 9655cf280779021e6241a08f8610cad9b982763f (patch) | |
tree | 82ef6d74969e4b64971d64a6a18e4488729167a8 /OpenSim/Region/Application | |
parent | * Just some tidy up and documentation before I make my first ever attempt to ... (diff) | |
download | opensim-SC_OLD-9655cf280779021e6241a08f8610cad9b982763f.zip opensim-SC_OLD-9655cf280779021e6241a08f8610cad9b982763f.tar.gz opensim-SC_OLD-9655cf280779021e6241a08f8610cad9b982763f.tar.bz2 opensim-SC_OLD-9655cf280779021e6241a08f8610cad9b982763f.tar.xz |
* Refactor: Break out permissions code into a separate region PermissionsModule
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 43f7375..a25f3c0 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -74,7 +74,6 @@ namespace OpenSim | |||
74 | protected List<RegionInfo> m_regionData = new List<RegionInfo>(); | 74 | protected List<RegionInfo> m_regionData = new List<RegionInfo>(); |
75 | 75 | ||
76 | protected bool m_physicalPrim; | 76 | protected bool m_physicalPrim; |
77 | protected bool m_permissions = false; | ||
78 | 77 | ||
79 | protected bool m_standaloneAuthenticate = false; | 78 | protected bool m_standaloneAuthenticate = false; |
80 | protected string m_standaloneWelcomeMessage = null; | 79 | protected string m_standaloneWelcomeMessage = null; |
@@ -263,9 +262,7 @@ namespace OpenSim | |||
263 | m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); | 262 | m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); |
264 | 263 | ||
265 | m_see_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); | 264 | m_see_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); |
266 | 265 | ||
267 | m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); | ||
268 | |||
269 | m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.Data.SQLite.dll"); | 266 | m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.Data.SQLite.dll"); |
270 | if (m_storageDll == "OpenSim.DataStore.MonoSqlite.dll") | 267 | if (m_storageDll == "OpenSim.DataStore.MonoSqlite.dll") |
271 | { | 268 | { |
@@ -490,7 +487,7 @@ namespace OpenSim | |||
490 | } | 487 | } |
491 | 488 | ||
492 | IClientNetworkServer clientServer; | 489 | IClientNetworkServer clientServer; |
493 | Scene scene = SetupScene(regionInfo, proxyOffset, out clientServer, m_permissions); | 490 | Scene scene = SetupScene(regionInfo, proxyOffset, out clientServer); |
494 | 491 | ||
495 | m_log.Info("[MODULES]: Loading Region's modules"); | 492 | m_log.Info("[MODULES]: Loading Region's modules"); |
496 | 493 | ||
@@ -530,9 +527,6 @@ namespace OpenSim | |||
530 | // and has to happen before the region is registered with the grid. | 527 | // and has to happen before the region is registered with the grid. |
531 | scene.CreateTerrainTexture(true); | 528 | scene.CreateTerrainTexture(true); |
532 | scene.RegisterRegionWithGrid(); | 529 | scene.RegisterRegionWithGrid(); |
533 | |||
534 | //Server side object editing permissions checking | ||
535 | scene.PermissionsMngr.BypassPermissions = !m_permissions; | ||
536 | 530 | ||
537 | // We need to do this after we've initialized the scripting engines. | 531 | // We need to do this after we've initialized the scripting engines. |
538 | scene.StartScripts(); | 532 | scene.StartScripts(); |
@@ -565,10 +559,9 @@ namespace OpenSim | |||
565 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, | 559 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, |
566 | AgentCircuitManager circuitManager) | 560 | AgentCircuitManager circuitManager) |
567 | { | 561 | { |
568 | PermissionManager permissionManager = new PermissionManager(); | ||
569 | SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); | 562 | SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); |
570 | return | 563 | return |
571 | new Scene(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService, m_assetCache, | 564 | new Scene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, |
572 | storageManager, m_httpServer, | 565 | storageManager, m_httpServer, |
573 | m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_see_into_region_from_neighbor); | 566 | m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_see_into_region_from_neighbor); |
574 | } | 567 | } |