aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
authorMW2007-11-18 11:11:44 +0000
committerMW2007-11-18 11:11:44 +0000
commit7f996448647e2703b82ea750bd38196fe5cea838 (patch)
tree2a44306e80f955d3381562b49d121413b53b8512 /OpenSim/Region/Application/OpenSimMain.cs
parentFor every problem there's a solution that is simple, neat and wrong. (diff)
downloadopensim-SC_OLD-7f996448647e2703b82ea750bd38196fe5cea838.zip
opensim-SC_OLD-7f996448647e2703b82ea750bd38196fe5cea838.tar.gz
opensim-SC_OLD-7f996448647e2703b82ea750bd38196fe5cea838.tar.bz2
opensim-SC_OLD-7f996448647e2703b82ea750bd38196fe5cea838.tar.xz
Attempt to get World Map working in Grid mode, will need to be using the grid asset server for it to work correctly and has only been quickly tested in a three region grid.
Moved PermissionManager creation out of the Scene constructor and instead a PermissionManager is passed to the constructor as a param. So that we could create and use custom permissionsManagers. Added AllowMovement property to ScenePresence which can be used to stop movement of avatars (for example in a custom region that wanted avatars always in one place). Added PermissionManager call when copying objects, although currently the call will always return true so that it allows copying in places like Wright Plaza. A few other changes/fixes.
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index c1df86c..ce2b856 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -366,9 +366,10 @@ namespace OpenSim
366 protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, 366 protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
367 AgentCircuitManager circuitManager) 367 AgentCircuitManager circuitManager)
368 { 368 {
369 PermissionManager permissionManager = new PermissionManager();
369 SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); 370 SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager);
370 return 371 return
371 new Scene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, storageManager, m_httpServer, 372 new Scene(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService, m_assetCache, storageManager, m_httpServer,
372 m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim); 373 m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim);
373 } 374 }
374 375