diff options
author | Teravus Ovares | 2008-02-11 05:19:54 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-02-11 05:19:54 +0000 |
commit | e6453d9b9d347ee366590c05053f38abb4852b43 (patch) | |
tree | ef7fbec17f32ffccd800d102c5947b14b83dec34 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | * um, Prim crossings? Experimental. (diff) | |
download | opensim-SC_OLD-e6453d9b9d347ee366590c05053f38abb4852b43.zip opensim-SC_OLD-e6453d9b9d347ee366590c05053f38abb4852b43.tar.gz opensim-SC_OLD-e6453d9b9d347ee366590c05053f38abb4852b43.tar.bz2 opensim-SC_OLD-e6453d9b9d347ee366590c05053f38abb4852b43.tar.xz |
* Changed child_get_tasks to see_into_this_sim_from_neighbor.
* Turned on see_into_this_sim_from_neighbor by default.
* Fix Race Condition with parts being added to a group while the simulator is starting up.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 999de9c..88cda40 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -77,7 +77,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
77 | 77 | ||
78 | private readonly Mutex updateLock; | 78 | private readonly Mutex updateLock; |
79 | public bool m_physicalPrim; | 79 | public bool m_physicalPrim; |
80 | public bool m_sendTasksToChild; | 80 | public bool m_seeIntoRegionFromNeighbor; |
81 | private int m_RestartTimerCounter; | 81 | private int m_RestartTimerCounter; |
82 | private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing | 82 | private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing |
83 | private int m_incrementsof15seconds = 0; | 83 | private int m_incrementsof15seconds = 0; |
@@ -224,7 +224,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
224 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, PermissionManager permissionManager, | 224 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, PermissionManager permissionManager, |
225 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, | 225 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, |
226 | AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, | 226 | AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, |
227 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SendTasksToChild) | 227 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SeeIntoRegionFromNeighbor) |
228 | { | 228 | { |
229 | updateLock = new Mutex(false); | 229 | updateLock = new Mutex(false); |
230 | 230 | ||
@@ -241,7 +241,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
241 | m_datastore = m_regInfo.DataStore; | 241 | m_datastore = m_regInfo.DataStore; |
242 | 242 | ||
243 | m_physicalPrim = physicalPrim; | 243 | m_physicalPrim = physicalPrim; |
244 | m_sendTasksToChild = SendTasksToChild; | 244 | m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor; |
245 | 245 | ||
246 | m_eventManager = new EventManager(); | 246 | m_eventManager = new EventManager(); |
247 | 247 | ||
@@ -317,7 +317,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
317 | OSString = OSString.Substring(0, 45); | 317 | OSString = OSString.Substring(0, 45); |
318 | } | 318 | } |
319 | 319 | ||
320 | m_simulatorVersion = "OpenSimulator v0.5-SVN on " + OSString + " ChilTasks:" + m_sendTasksToChild.ToString() + " PhysPrim:" + m_physicalPrim.ToString(); | 320 | m_simulatorVersion = "OpenSimulator v0.5-SVN on " + OSString + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() + " PhysPrim:" + m_physicalPrim.ToString(); |
321 | } | 321 | } |
322 | 322 | ||
323 | #endregion | 323 | #endregion |