aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-12 16:57:56 +0000
committerJustin Clarke Casey2008-05-12 16:57:56 +0000
commitd3fb6039cad7b828dec8a1d7aef66aa10e6afdf2 (patch)
treec7e3a49e79878e4ea2958ee6ce188b2f0559be80 /OpenSim/Region/ClientStack
parent* Minor: Change 'delete region' message to region logout message (diff)
downloadopensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.zip
opensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.tar.gz
opensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.tar.bz2
opensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.tar.xz
* If a region running in grid mode fails to login to the grid service, startup will now terminate instead of carrying on (and thus burying the error message)
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs6
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 1dcab20..5e0e074 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -129,10 +129,6 @@ namespace OpenSim.Region.ClientStack
129 129
130 scene.LoadWorldMap(); 130 scene.LoadWorldMap();
131 131
132 //moved to opensimMain as these have to happen after modules are initialised
133 // scene.CreateTerrainTexture(true);
134 // scene.RegisterRegionWithGrid();
135
136 scene.PhysicsScene = GetPhysicsScene(); 132 scene.PhysicsScene = GetPhysicsScene();
137 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); 133 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised());
138 scene.PhysicsScene.SetWaterLevel(regionInfo.EstateSettings.waterHeight); 134 scene.PhysicsScene.SetWaterLevel(regionInfo.EstateSettings.waterHeight);
@@ -171,4 +167,4 @@ namespace OpenSim.Region.ClientStack
171 protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, 167 protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
172 AgentCircuitManager circuitManager); 168 AgentCircuitManager circuitManager);
173 } 169 }
174} \ No newline at end of file 170}