ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

*Added EstateSettings.cs and moved many relevant variables from RegionInfoBase to EstateSettings class and added an EstateSettings objection to RegionInfoBase

Browse Source 
*Added a few missed copyright headers
*Fixed a filename typo
This commit is contained in:
mingchen
2007-06-07 16:29:10 +00:00
parent 3fa76db3be
commit 458c6b6f16
23 changed files with 440 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/OpenSim.RegionServer/Simulator/World.cs
View File

@@ -463,7 +463,7 @@ namespace OpenSim.RegionServer.Simulator
float[] map = this.localStorage.LoadWorld();
if (map == null)
{
if (string.IsNullOrEmpty(this.m_regInfo.TerrainFile))
if (string.IsNullOrEmpty(this.m_regInfo.estateSettings.terrainFile))
{
Console.WriteLine("No default terrain, procedurally generating...");
this.Terrain.hills();
@@ -474,8 +474,8 @@ namespace OpenSim.RegionServer.Simulator
{
try
{
this.Terrain.loadFromFileF32(this.m_regInfo.TerrainFile);
this.Terrain *= this.m_regInfo.TerrainMultiplier;
this.Terrain.loadFromFileF32(this.m_regInfo.estateSettings.terrainFile);
this.Terrain *= this.m_regInfo.estateSettings.terrainMultiplier;
}
catch (Exception e)
{