diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 4a57d13..203f831 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
115 | #region Constructors | 115 | #region Constructors |
116 | 116 | ||
117 | /// <summary> | 117 | /// <summary> |
118 | /// Creates a new World class, and a region to go with it. | 118 | /// Creates a new Scene class, and a region to go with it. |
119 | /// </summary> | 119 | /// </summary> |
120 | /// <param name="clientThreads">Dictionary to contain client threads</param> | 120 | /// <param name="clientThreads">Dictionary to contain client threads</param> |
121 | /// <param name="regionHandle">Region Handle for this region</param> | 121 | /// <param name="regionHandle">Region Handle for this region</param> |
@@ -198,7 +198,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
198 | } | 198 | } |
199 | 199 | ||
200 | /// <summary> | 200 | /// <summary> |
201 | /// Performs per-frame updates on the scene, this should be the central world loop | 201 | /// Performs per-frame updates on the scene, this should be the central scene loop |
202 | /// </summary> | 202 | /// </summary> |
203 | public override void Update() | 203 | public override void Update() |
204 | { | 204 | { |
@@ -232,7 +232,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
232 | // General purpose event manager | 232 | // General purpose event manager |
233 | m_eventManager.TriggerOnFrame(); | 233 | m_eventManager.TriggerOnFrame(); |
234 | 234 | ||
235 | //backup world data | 235 | //backup scene data |
236 | storageCount++; | 236 | storageCount++; |
237 | if (storageCount > 1200) //set to how often you want to backup | 237 | if (storageCount > 1200) //set to how often you want to backup |
238 | { | 238 | { |
@@ -293,9 +293,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
293 | } | 293 | } |
294 | } | 294 | } |
295 | } | 295 | } |
296 | catch (NotImplementedException) | ||
297 | { | ||
298 | throw; | ||
299 | } | ||
296 | catch (Exception e) | 300 | catch (Exception e) |
297 | { | 301 | { |
298 | MainLog.Instance.Warn("scene", "World.cs: Update() - Failed with exception " + e.ToString()); | 302 | MainLog.Instance.Error("Scene", "Update() - Failed with exception " + e.ToString()); |
299 | } | 303 | } |
300 | updateLock.ReleaseMutex(); | 304 | updateLock.ReleaseMutex(); |
301 | } | 305 | } |