diff options
Diffstat (limited to 'OpenSim/Region/Examples')
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/MyWorld.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/Program.cs | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs index ae2f5ad..8cfbf27 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs | |||
@@ -42,10 +42,10 @@ namespace SimpleApp | |||
42 | { | 42 | { |
43 | private List<ScenePresence> m_avatars; | 43 | private List<ScenePresence> m_avatars; |
44 | 44 | ||
45 | public MyWorld(RegionInfo regionInfo, AgentCircuitManager authen, CommunicationsManager commsMan, SceneCommunicationService sceneGridService, | 45 | public MyWorld(RegionInfo regionInfo, AgentCircuitManager authen, PermissionManager permissionManager, CommunicationsManager commsMan, SceneCommunicationService sceneGridService, |
46 | AssetCache assetCach, StorageManager storeMan, BaseHttpServer httpServer, | 46 | AssetCache assetCach, StorageManager storeMan, BaseHttpServer httpServer, |
47 | ModuleLoader moduleLoader, bool physicalPrim) | 47 | ModuleLoader moduleLoader, bool physicalPrim) |
48 | : base(regionInfo, authen, commsMan, sceneGridService, assetCach, storeMan, httpServer, moduleLoader, false, true) | 48 | : base(regionInfo, authen, permissionManager, commsMan, sceneGridService, assetCach, storeMan, httpServer, moduleLoader, false, true) |
49 | { | 49 | { |
50 | m_avatars = new List<Avatar>(); | 50 | m_avatars = new List<Avatar>(); |
51 | } | 51 | } |
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index bd88e61..10b6258 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs | |||
@@ -169,9 +169,10 @@ namespace SimpleApp | |||
169 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, | 169 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, |
170 | AgentCircuitManager circuitManager) | 170 | AgentCircuitManager circuitManager) |
171 | { | 171 | { |
172 | PermissionManager permissionManager = new PermissionManager(); | ||
172 | SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); | 173 | SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); |
173 | return | 174 | return |
174 | new MyWorld(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, storageManager, m_httpServer, | 175 | new MyWorld(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService, m_assetCache, storageManager, m_httpServer, |
175 | new ModuleLoader(m_log, m_config), true); | 176 | new ModuleLoader(m_log, m_config), true); |
176 | } | 177 | } |
177 | 178 | ||