diff options
| author | Melanie | 2010-05-10 03:57:44 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-10 03:57:44 +0100 |
| commit | 3e8ceb350972a1d00c4163fecd8172602cdcd865 (patch) | |
| tree | 9a23412c280440ff1762999c2d93fdd2685d0196 /OpenSim/Region/Application | |
| parent | Fix a null ref on region crossing (diff) | |
| parent | OK, this really fixes it, I promise. (diff) | |
| download | opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.zip opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.gz opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.bz2 opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 06ffa91..83be61e 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -349,7 +349,7 @@ namespace OpenSim | |||
| 349 | 349 | ||
| 350 | // moved these here as the terrain texture has to be created after the modules are initialized | 350 | // moved these here as the terrain texture has to be created after the modules are initialized |
| 351 | // and has to happen before the region is registered with the grid. | 351 | // and has to happen before the region is registered with the grid. |
| 352 | scene.CreateTerrainTexture(false); | 352 | scene.CreateTerrainTexture(); |
| 353 | 353 | ||
| 354 | // TODO : Try setting resource for region xstats here on scene | 354 | // TODO : Try setting resource for region xstats here on scene |
| 355 | MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); | 355 | MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); |