OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Some minor renamings

afrisby
lbsa71 2007-07-16 13:00:32 +00:00
parent 7f10179129
commit cba02cb632
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -112,7 +112,7 @@ namespace OpenSim
this.physManager = new PhysicsManager(); this.physManager = new PhysicsManager();
this.physManager.LoadPlugins(); this.physManager.LoadPlugins();
this.SetupWorld(); this.SetupScene();
m_log.Verbose("Main.cs:Startup() - Initialising HTTP server"); 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; IGenericConfig regionConfig;
Scene LocalWorld; Scene scene;
UDPServer udpServer; UDPServer udpServer;
RegionInfo regionDat = new RegionInfo(); RegionInfo regionDat = new RegionInfo();
AuthenticateSessionsBase authenBase; AuthenticateSessionsBase authenBase;
@ -213,35 +213,35 @@ namespace OpenSim
StorageManager tmpStoreManager = new StorageManager("OpenSim.DataStore.NullStorage.dll", regionDat.DataStore, regionDat.RegionName); StorageManager tmpStoreManager = new StorageManager("OpenSim.DataStore.NullStorage.dll", regionDat.DataStore, regionDat.RegionName);
LocalWorld = new Scene( regionDat, authenBase, commsManager, this.AssetCache, tmpStoreManager, httpServer); scene = new Scene( regionDat, authenBase, commsManager, this.AssetCache, tmpStoreManager, httpServer);
this.m_localWorld.Add(LocalWorld); 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. scene.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
LocalWorld.LoadWorldMap(); scene.LoadWorldMap();
m_log.Verbose("Main.cs:Startup() - Starting up messaging system"); m_log.Verbose("Main.cs:Startup() - Starting up messaging system");
LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); scene.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D()); scene.PhysScene.SetTerrain(scene.Terrain.getHeights1D());
LocalWorld.LoadPrimsFromStorage(); scene.LoadPrimsFromStorage();
//Master Avatar Setup //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) if (masterAvatar != null)
{ {
m_log.Notice("Parcels - Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); m_log.Notice("Parcels - Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]");
LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.ParcelManager); scene.localStorage.LoadParcels((ILocalStorageParcelReceiver)scene.ParcelManager);
} }
else else
{ {
m_log.Notice("Parcels - No master avatar found, using null."); m_log.Notice("Parcels - No master avatar found, using null.");
LocalWorld.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero; scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero;
LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.ParcelManager); scene.localStorage.LoadParcels((ILocalStorageParcelReceiver)scene.ParcelManager);
} }
LocalWorld.performParcelPrimCountUpdate(); LocalWorld.performParcelPrimCountUpdate();
LocalWorld.StartTimer(); scene.StartTimer();
} }
} }

2
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@ -102,7 +102,7 @@ namespace OpenSim.Region.ClientStack
} }
protected virtual void SetupWorld() protected virtual void SetupScene()
{ {
} }