diff options
| author | John Hurliman | 2009-11-04 16:08:23 -0800 |
|---|---|---|
| committer | John Hurliman | 2009-11-04 16:08:23 -0800 |
| commit | f57a646638340063e22d1f38c37502afaf963137 (patch) | |
| tree | ea109f74119cf552805c601bd13d3a2a697cd9a5 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Removing EntityBase.Rotation (diff) | |
| parent | Add some length to the backet buffer for packet sending so oversize (diff) | |
| download | opensim-SC_OLD-f57a646638340063e22d1f38c37502afaf963137.zip opensim-SC_OLD-f57a646638340063e22d1f38c37502afaf963137.tar.gz opensim-SC_OLD-f57a646638340063e22d1f38c37502afaf963137.tar.bz2 opensim-SC_OLD-f57a646638340063e22d1f38c37502afaf963137.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index a6ee40a..093ca3e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1043,7 +1043,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1043 | TimeSpan SinceLastFrame = DateTime.UtcNow - m_lastupdate; | 1043 | TimeSpan SinceLastFrame = DateTime.UtcNow - m_lastupdate; |
| 1044 | physicsFPS = 0f; | 1044 | physicsFPS = 0f; |
| 1045 | 1045 | ||
| 1046 | maintc = maintc = otherMS = Environment.TickCount; | 1046 | maintc = otherMS = Environment.TickCount; |
| 1047 | int tmpFrameMS = maintc; | 1047 | int tmpFrameMS = maintc; |
| 1048 | 1048 | ||
| 1049 | // Increment the frame counter | 1049 | // Increment the frame counter |