diff options
| author | Melanie | 2011-01-14 04:09:02 +0100 |
|---|---|---|
| committer | Melanie | 2011-01-14 04:09:02 +0100 |
| commit | a30bbcbb64e9b985b0db4c4b795ad369d7f4cda7 (patch) | |
| tree | 8485a88879d808d7f3c032380010eb2cc9734346 /OpenSim | |
| parent | Implement nonlocal god kicks and freezes (diff) | |
| download | opensim-SC_OLD-a30bbcbb64e9b985b0db4c4b795ad369d7f4cda7.zip opensim-SC_OLD-a30bbcbb64e9b985b0db4c4b795ad369d7f4cda7.tar.gz opensim-SC_OLD-a30bbcbb64e9b985b0db4c4b795ad369d7f4cda7.tar.bz2 opensim-SC_OLD-a30bbcbb64e9b985b0db4c4b795ad369d7f4cda7.tar.xz | |
Temporarily reinstate prim counting in the update loop to make the production
systems run
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 066e504..a4f630a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -151,7 +151,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 151 | private int m_update_events = 1; | 151 | private int m_update_events = 1; |
| 152 | private int m_update_backup = 200; | 152 | private int m_update_backup = 200; |
| 153 | private int m_update_terrain = 50; | 153 | private int m_update_terrain = 50; |
| 154 | // private int m_update_land = 1; | 154 | private int m_update_land = 10; |
| 155 | private int m_update_coarse_locations = 50; | 155 | private int m_update_coarse_locations = 50; |
| 156 | 156 | ||
| 157 | private int frameMS; | 157 | private int frameMS; |
| @@ -1330,12 +1330,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1330 | terrainMS = Util.EnvironmentTickCountSubtract(terMS); | 1330 | terrainMS = Util.EnvironmentTickCountSubtract(terMS); |
| 1331 | } | 1331 | } |
| 1332 | 1332 | ||
| 1333 | //if (m_frame % m_update_land == 0) | 1333 | if (m_frame % m_update_land == 0) |
| 1334 | //{ | 1334 | { |
| 1335 | // int ldMS = Util.EnvironmentTickCount(); | 1335 | int ldMS = Util.EnvironmentTickCount(); |
| 1336 | // UpdateLand(); | 1336 | UpdateLand(); |
| 1337 | // landMS = Util.EnvironmentTickCountSubtract(ldMS); | 1337 | landMS = Util.EnvironmentTickCountSubtract(ldMS); |
| 1338 | //} | 1338 | } |
| 1339 | 1339 | ||
| 1340 | frameMS = Util.EnvironmentTickCountSubtract(tmpFrameMS); | 1340 | frameMS = Util.EnvironmentTickCountSubtract(tmpFrameMS); |
| 1341 | otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS; | 1341 | otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS; |