diff options
| author | Justin Clark-Casey (justincc) | 2009-09-16 18:20:55 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-09-16 18:20:55 +0100 |
| commit | 35260faead29c590bf01c1eb02130cfac22c38ad (patch) | |
| tree | a2a8e6bc038440311bcdda6cfd9331af47e0059f /OpenSim/Region/Framework | |
| parent | This fix allows you to configure a script-to-console-log channel (diff) | |
| download | opensim-SC_OLD-35260faead29c590bf01c1eb02130cfac22c38ad.zip opensim-SC_OLD-35260faead29c590bf01c1eb02130cfac22c38ad.tar.gz opensim-SC_OLD-35260faead29c590bf01c1eb02130cfac22c38ad.tar.bz2 opensim-SC_OLD-35260faead29c590bf01c1eb02130cfac22c38ad.tar.xz | |
on iar save/load, let the user know if they put in the wrong password
refactor GetUserInfo() to eliminate copypasta
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0c2f991..a8028a6 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -994,9 +994,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 994 | 994 | ||
| 995 | // Loop it | 995 | // Loop it |
| 996 | if (m_frame == Int32.MaxValue) | 996 | if (m_frame == Int32.MaxValue) |
| 997 | m_frame = 0; | 997 | m_frame = 0; |
| 998 | |||
| 999 | |||
| 1000 | 998 | ||
| 1001 | otherMS = Environment.TickCount; | 999 | otherMS = Environment.TickCount; |
| 1002 | // run through all entities looking for updates (slow) | 1000 | // run through all entities looking for updates (slow) |
| @@ -1017,7 +1015,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1017 | m_sceneGraph.UpdateEntities(); | 1015 | m_sceneGraph.UpdateEntities(); |
| 1018 | } | 1016 | } |
| 1019 | 1017 | ||
| 1020 | |||
| 1021 | // run through entities that have scheduled themselves for | 1018 | // run through entities that have scheduled themselves for |
| 1022 | // updates looking for updates(faster) | 1019 | // updates looking for updates(faster) |
| 1023 | if (m_frame % m_update_entitiesquick == 0) | 1020 | if (m_frame % m_update_entitiesquick == 0) |