ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert r2162 as it completely clobbered all the work on

Browse Source 
the ChatModule by MW and myself.  Couldn't find Adam online
after that rev went in.
This commit is contained in:
Sean Dague
2007-10-22 15:37:54 +00:00
parent c4707a284f
commit 6acaabefc3
18 changed files with 500 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -370,7 +370,7 @@ namespace OpenSim.Region.Environment.Scenes
phyScene.SetTerrain(Terrain.GetHeights1D());
}
storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(),RegionInfo.RegionID);
storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
float[] terData = Terrain.GetHeights1D();
@@ -466,7 +466,7 @@ namespace OpenSim.Region.Environment.Scenes
{
try
{
double[,] map = storageManager.DataStore.LoadTerrain(RegionInfo.RegionID);
double[,] map = storageManager.DataStore.LoadTerrain();
if (map == null)
{
if (string.IsNullOrEmpty(m_regInfo.estateSettings.terrainFile))
@@ -474,7 +474,7 @@ namespace OpenSim.Region.Environment.Scenes
MainLog.Instance.Verbose("TERRAIN", "No default terrain. Generating a new terrain.");
Terrain.HillsGenerator();
storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(),RegionInfo.RegionID);
storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
}
else
{
@@ -488,7 +488,7 @@ namespace OpenSim.Region.Environment.Scenes
MainLog.Instance.Verbose("TERRAIN", "No terrain found in database or default. Generating a new terrain.");
Terrain.HillsGenerator();
}
storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(), RegionInfo.RegionID);
storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD());
}
}
else