diff options
author | Teravus Ovares | 2007-11-21 02:17:24 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-21 02:17:24 +0000 |
commit | 7cb38712d5ad6781e672e4f1c8500ecd88d85f3e (patch) | |
tree | 5203c9901fdbba5ec8d9a21880d7895f593af540 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | fix for mantis #2 from Justin Casey (IBM) (diff) | |
download | opensim-SC_OLD-7cb38712d5ad6781e672e4f1c8500ecd88d85f3e.zip opensim-SC_OLD-7cb38712d5ad6781e672e4f1c8500ecd88d85f3e.tar.gz opensim-SC_OLD-7cb38712d5ad6781e672e4f1c8500ecd88d85f3e.tar.bz2 opensim-SC_OLD-7cb38712d5ad6781e672e4f1c8500ecd88d85f3e.tar.xz |
* Did some initial work for prim crossing. Just glue so far.
* Added the child_get_tasks OpenSim.ini flag for testing the UDP packet sending code and packet throttler. This flag gets purposely disabled in grid mode. This flag also has the consequence that you can see the prim in neighboring regions without going into them. Be warned, this causes tons of dropped packets.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 405f2e3..90306f2 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -69,6 +69,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
69 | 69 | ||
70 | private readonly Mutex updateLock; | 70 | private readonly Mutex updateLock; |
71 | public bool m_physicalPrim; | 71 | public bool m_physicalPrim; |
72 | public bool m_sendTasksToChild; | ||
72 | protected ModuleLoader m_moduleLoader; | 73 | protected ModuleLoader m_moduleLoader; |
73 | protected StorageManager m_storageManager; | 74 | protected StorageManager m_storageManager; |
74 | protected AgentCircuitManager m_authenticateHandler; | 75 | protected AgentCircuitManager m_authenticateHandler; |
@@ -197,7 +198,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
197 | 198 | ||
198 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, PermissionManager permissionManager, CommunicationsManager commsMan, SceneCommunicationService sceneGridService, | 199 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, PermissionManager permissionManager, CommunicationsManager commsMan, SceneCommunicationService sceneGridService, |
199 | AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, | 200 | AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, |
200 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim) | 201 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SendTasksToChild) |
201 | { | 202 | { |
202 | updateLock = new Mutex(false); | 203 | updateLock = new Mutex(false); |
203 | 204 | ||
@@ -213,6 +214,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
213 | m_datastore = m_regInfo.DataStore; | 214 | m_datastore = m_regInfo.DataStore; |
214 | RegisterRegionWithComms(); | 215 | RegisterRegionWithComms(); |
215 | m_physicalPrim = physicalPrim; | 216 | m_physicalPrim = physicalPrim; |
217 | m_sendTasksToChild = SendTasksToChild; | ||
216 | 218 | ||
217 | m_LandManager = new LandManager(this, m_regInfo); | 219 | m_LandManager = new LandManager(this, m_regInfo); |
218 | m_estateManager = new EstateManager(this, m_regInfo); | 220 | m_estateManager = new EstateManager(this, m_regInfo); |