aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorBrian McBee2007-11-24 03:55:35 +0000
committerBrian McBee2007-11-24 03:55:35 +0000
commit892f9425237de33a754517706113909886957f6f (patch)
treec11e0b816b1004f710a110a0cc0881be7a1262dc /OpenSim
parent* Added a way for the Region master user to kick individual users from their ... (diff)
downloadopensim-SC_OLD-892f9425237de33a754517706113909886957f6f.zip
opensim-SC_OLD-892f9425237de33a754517706113909886957f6f.tar.gz
opensim-SC_OLD-892f9425237de33a754517706113909886957f6f.tar.bz2
opensim-SC_OLD-892f9425237de33a754517706113909886957f6f.tar.xz
Test storing terrain texture to grid assetserver on startup. Needed for main map functionality.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs15
1 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 0883e5c..5ebdbe8 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -563,7 +563,7 @@ namespace OpenSim.Region.Environment.Scenes
563 Terrain.SetHeights2D(map); 563 Terrain.SetHeights2D(map);
564 } 564 }
565 565
566 CreateTerrainTexture(); 566 CreateTerrainTextureInitial();
567 CommsManager.GridService.RegisterRegion(RegionInfo); //hack to update the terrain texture in grid mode so it shows on world map 567 CommsManager.GridService.RegisterRegion(RegionInfo); //hack to update the terrain texture in grid mode so it shows on world map
568 } 568 }
569 catch (Exception e) 569 catch (Exception e)
@@ -589,6 +589,19 @@ namespace OpenSim.Region.Environment.Scenes
589 AssetCache.AddAsset(asset); 589 AssetCache.AddAsset(asset);
590 } 590 }
591 591
592 public void CreateTerrainTextureInitial()
593 {
594 //create a texture asset of the terrain
595 byte[] data = Terrain.ExportJpegImage("defaultstripe.png");
596 m_regInfo.EstateSettings.terrainImageID = LLUUID.Random();
597 AssetBase asset = new AssetBase();
598 asset.FullID = m_regInfo.EstateSettings.terrainImageID;
599 asset.Data = data;
600 asset.Name = "terrainImage";
601 asset.Type = 0;
602 asset.Temporary = false;
603 AssetCache.AddAsset(asset);
604 }
592 #endregion 605 #endregion
593 606
594 #region Primitives Methods 607 #region Primitives Methods