From cba02cb6321facd8621763880d8cf8c85647bd0d Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Mon, 16 Jul 2007 13:00:32 +0000
Subject: * Some minor renamings

---
 OpenSim/Region/Application/OpenSimMain.cs          | 34 +++++++++++-----------
 .../Region/ClientStack/RegionApplicationBase.cs    |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 4815b89..0016d15 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -112,7 +112,7 @@ namespace OpenSim
             this.physManager = new PhysicsManager();
             this.physManager.LoadPlugins();
 
-            this.SetupWorld();
+            this.SetupScene();
 
             m_log.Verbose("Main.cs:Startup() - Initialising HTTP server");
 
@@ -160,10 +160,10 @@ namespace OpenSim
             }
         }
 
-        protected override void SetupWorld()
+        protected override void SetupScene()
         {
             IGenericConfig regionConfig;
-            Scene LocalWorld;
+            Scene scene;
             UDPServer udpServer;
             RegionInfo regionDat = new RegionInfo();
             AuthenticateSessionsBase authenBase;
@@ -213,35 +213,35 @@ namespace OpenSim
 
                 StorageManager tmpStoreManager = new StorageManager("OpenSim.DataStore.NullStorage.dll", regionDat.DataStore, regionDat.RegionName);
 
-                LocalWorld = new Scene( regionDat, authenBase, commsManager, this.AssetCache, tmpStoreManager, httpServer);
-                this.m_localWorld.Add(LocalWorld);
+                scene = new Scene( regionDat, authenBase, commsManager, this.AssetCache, tmpStoreManager, httpServer);
+                this.m_localWorld.Add(scene);
 
-                udpServer.LocalWorld = LocalWorld;
+                udpServer.LocalWorld = scene;
 
-                LocalWorld.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
-                LocalWorld.LoadWorldMap();
+                scene.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
+                scene.LoadWorldMap();
 
                 m_log.Verbose("Main.cs:Startup() - Starting up messaging system");
-                LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
-                LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
-                LocalWorld.LoadPrimsFromStorage();
+                scene.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
+                scene.PhysScene.SetTerrain(scene.Terrain.getHeights1D());
+                scene.LoadPrimsFromStorage();
 
                 //Master Avatar Setup
-                UserProfileData masterAvatar = commsManager.UserServer.SetupMasterUser(LocalWorld.RegionInfo.MasterAvatarFirstName, LocalWorld.RegionInfo.MasterAvatarLastName, LocalWorld.RegionInfo.MasterAvatarSandboxPassword);
+                UserProfileData masterAvatar = commsManager.UserServer.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarSandboxPassword);
                 if (masterAvatar != null)
                 {
                     m_log.Notice("Parcels - Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]");
-                    LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
-                    LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.ParcelManager);
+                    scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
+                    scene.localStorage.LoadParcels((ILocalStorageParcelReceiver)scene.ParcelManager);
                 }
                 else
                 {
                     m_log.Notice("Parcels - No master avatar found, using null.");
-                    LocalWorld.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero;
-                    LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.ParcelManager);
+                    scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero;
+                    scene.localStorage.LoadParcels((ILocalStorageParcelReceiver)scene.ParcelManager);
                 }
                 LocalWorld.performParcelPrimCountUpdate();
-                LocalWorld.StartTimer();
+                scene.StartTimer();
             }
         }
 
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 622b89c..7ae74f8 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -102,7 +102,7 @@ namespace OpenSim.Region.ClientStack
 
         }
 
-        protected virtual void SetupWorld()
+        protected virtual void SetupScene()
         {
         }
 
-- 
cgit v1.1