diff options
author | MW | 2008-03-29 17:18:47 +0000 |
---|---|---|
committer | MW | 2008-03-29 17:18:47 +0000 |
commit | 7fcffa3a3a231a77d00bf2ec1772f0914073d28f (patch) | |
tree | b5fa20f2a997edff3150f6643b7a123751e614f4 /OpenSim/Region/Application/OpenSimMain.cs | |
parent | Fix compiler warnings in BulletXPlugin. (diff) | |
download | opensim-SC-7fcffa3a3a231a77d00bf2ec1772f0914073d28f.zip opensim-SC-7fcffa3a3a231a77d00bf2ec1772f0914073d28f.tar.gz opensim-SC-7fcffa3a3a231a77d00bf2ec1772f0914073d28f.tar.bz2 opensim-SC-7fcffa3a3a231a77d00bf2ec1772f0914073d28f.tar.xz |
Re-enabled terrain texture generation for the world map. Adam can clean up/ sort it out when he gets time.
Most likely doesn't really work in grid mode as the generated textures are marked as temporary and I don't think they are updated to the asset server. We have to either live with these textures being sent to the asset server, and manually clean them out from time to time or wait until there is some asset management system in place.
Also currently the texture is only generated at region startup, it is not updated after terraforming.
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index afaf988..e77aa6b 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -506,6 +506,11 @@ namespace OpenSim | |||
506 | m_moduleLoader.InitialiseSharedModules(scene); | 506 | m_moduleLoader.InitialiseSharedModules(scene); |
507 | scene.SetModuleInterfaces(); | 507 | scene.SetModuleInterfaces(); |
508 | 508 | ||
509 | //moved these here as the terrain texture has to be created after the modules are initialized | ||
510 | // and has to happen before the region is registered with the grid. | ||
511 | scene.CreateTerrainTexture(true); | ||
512 | scene.RegisterRegionWithGrid(); | ||
513 | |||
509 | //Server side object editing permissions checking | 514 | //Server side object editing permissions checking |
510 | scene.PermissionsMngr.BypassPermissions = !m_permissions; | 515 | scene.PermissionsMngr.BypassPermissions = !m_permissions; |
511 | 516 | ||