diff options
author | lbsa71 | 2007-08-06 13:40:45 +0000 |
---|---|---|
committer | lbsa71 | 2007-08-06 13:40:45 +0000 |
commit | 07b011af3aef4455ad183bf00d3eccb4ba7e69dc (patch) | |
tree | b62b36f38025fdf95c7b097e125a19c0411ecac7 /OpenSim/Region/Environment/Scenes | |
parent | * The empty Regions dir now back in svn (diff) | |
download | opensim-SC_OLD-07b011af3aef4455ad183bf00d3eccb4ba7e69dc.zip opensim-SC_OLD-07b011af3aef4455ad183bf00d3eccb4ba7e69dc.tar.gz opensim-SC_OLD-07b011af3aef4455ad183bf00d3eccb4ba7e69dc.tar.bz2 opensim-SC_OLD-07b011af3aef4455ad183bf00d3eccb4ba7e69dc.tar.xz |
* renamed some scene to world
* passing on NotImplemented from Update()
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs index 3eb34b4..84e8120 100644 --- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs +++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs | |||
@@ -57,10 +57,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
57 | /// <summary> | 57 | /// <summary> |
58 | /// | 58 | /// |
59 | /// </summary> | 59 | /// </summary> |
60 | public AllNewSceneObjectGroup2(Scene world, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape) | 60 | public AllNewSceneObjectGroup2(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape) |
61 | { | 61 | { |
62 | m_regionHandle = regionHandle; | 62 | m_regionHandle = regionHandle; |
63 | m_scene = world; | 63 | m_scene = scene; |
64 | 64 | ||
65 | this.Pos = pos; | 65 | this.Pos = pos; |
66 | LLVector3 rootOffset = new LLVector3(0, 0, 0); | 66 | LLVector3 rootOffset = new LLVector3(0, 0, 0); |
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 | } |