From 07b011af3aef4455ad183bf00d3eccb4ba7e69dc Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Mon, 6 Aug 2007 13:40:45 +0000
Subject: * renamed some scene to world * passing on NotImplemented from
 Update()

---
 OpenSim/Region/Environment/PermissionManager.cs              |  4 ++--
 OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs |  4 ++--
 OpenSim/Region/Environment/Scenes/Scene.cs                   | 12 ++++++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index ea93050..150a8ed 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -15,9 +15,9 @@ namespace OpenSim.Region.Environment
     {
         protected Scene m_scene;
 
-        public PermissionManager(Scene world)
+        public PermissionManager(Scene scene)
         {
-            m_scene = world;
+            m_scene = scene;
         }
 
         public delegate void OnPermissionErrorDelegate(LLUUID user, string reason);
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
         /// <summary>
         /// 
         /// </summary>
-        public AllNewSceneObjectGroup2(Scene world, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape)
+        public AllNewSceneObjectGroup2(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape)
         {
             m_regionHandle = regionHandle;
-            m_scene = world;
+            m_scene = scene;
 
             this.Pos = pos;
             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
         #region Constructors
 
         /// <summary>
-        /// Creates a new World class, and a region to go with it.
+        /// Creates a new Scene class, and a region to go with it.
         /// </summary>
         /// <param name="clientThreads">Dictionary to contain client threads</param>
         /// <param name="regionHandle">Region Handle for this region</param>
@@ -198,7 +198,7 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         /// <summary>
-        /// Performs per-frame updates on the scene, this should be the central world loop
+        /// Performs per-frame updates on the scene, this should be the central scene loop
         /// </summary>
         public override void Update()
         {
@@ -232,7 +232,7 @@ namespace OpenSim.Region.Environment.Scenes
                 // General purpose event manager
                 m_eventManager.TriggerOnFrame();
 
-                //backup world data
+                //backup scene data
                 storageCount++;
                 if (storageCount > 1200) //set to how often you want to backup 
                 {
@@ -293,9 +293,13 @@ namespace OpenSim.Region.Environment.Scenes
                     }
                 }
             }
+            catch (NotImplementedException)
+            {
+                throw;
+            }
             catch (Exception e)
             {
-                MainLog.Instance.Warn("scene", "World.cs: Update() - Failed with exception " + e.ToString());
+                MainLog.Instance.Error("Scene", "Update() - Failed with exception " + e.ToString());
             }
             updateLock.ReleaseMutex();
         }
-- 
cgit v1.1