diff options
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index d28d65a..3df4c8c 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -65,7 +65,7 @@ namespace OpenSim | |||
65 | public bool m_sandbox; | 65 | public bool m_sandbox; |
66 | public bool user_accounts; | 66 | public bool user_accounts; |
67 | public bool m_gridLocalAsset; | 67 | public bool m_gridLocalAsset; |
68 | public bool m_SendChildAgentTaskData; | 68 | public bool m_see_into_region_from_neighbor; |
69 | 69 | ||
70 | protected LocalLoginService m_loginService; | 70 | protected LocalLoginService m_loginService; |
71 | 71 | ||
@@ -167,7 +167,7 @@ namespace OpenSim | |||
167 | config.Set("physics", "basicphysics"); | 167 | config.Set("physics", "basicphysics"); |
168 | config.Set("verbose", true); | 168 | config.Set("verbose", true); |
169 | config.Set("physical_prim", true); | 169 | config.Set("physical_prim", true); |
170 | config.Set("child_get_tasks", false); | 170 | config.Set("see_into_this_sim_from_neighbor", true); |
171 | config.Set("serverside_object_permissions", false); | 171 | config.Set("serverside_object_permissions", false); |
172 | config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll"); | 172 | config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll"); |
173 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); | 173 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); |
@@ -238,7 +238,7 @@ namespace OpenSim | |||
238 | 238 | ||
239 | m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); | 239 | m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); |
240 | 240 | ||
241 | m_SendChildAgentTaskData = startupConfig.GetBoolean("child_get_tasks", false); | 241 | m_see_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); |
242 | 242 | ||
243 | m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); | 243 | m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); |
244 | 244 | ||
@@ -490,15 +490,10 @@ namespace OpenSim | |||
490 | { | 490 | { |
491 | PermissionManager permissionManager = new PermissionManager(); | 491 | PermissionManager permissionManager = new PermissionManager(); |
492 | SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); | 492 | SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); |
493 | if (m_SendChildAgentTaskData) | ||
494 | { | ||
495 | m_log.Error("[WARNING]: Send Child Agent Task Updates is enabled. This is for testing only."); | ||
496 | //Thread.Sleep(12000); | ||
497 | } | ||
498 | return | 493 | return |
499 | new Scene(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService, m_assetCache, | 494 | new Scene(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService, m_assetCache, |
500 | storageManager, m_httpServer, | 495 | storageManager, m_httpServer, |
501 | m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_SendChildAgentTaskData); | 496 | m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_see_into_region_from_neighbor); |
502 | } | 497 | } |
503 | 498 | ||
504 | 499 | ||