diff options
| author | MW | 2008-04-01 13:09:29 +0000 |
|---|---|---|
| committer | MW | 2008-04-01 13:09:29 +0000 |
| commit | f43e077150d39b454bd66d43a72736a75614a721 (patch) | |
| tree | 983031434fff79aa0ecc41478efccb205557d2ce /OpenSim/Region/Environment/Scenes | |
| parent | sadly, had to modify line by Ter because it caused mono cil compiler (diff) | |
| download | opensim-SC-f43e077150d39b454bd66d43a72736a75614a721.zip opensim-SC-f43e077150d39b454bd66d43a72736a75614a721.tar.gz opensim-SC-f43e077150d39b454bd66d43a72736a75614a721.tar.bz2 opensim-SC-f43e077150d39b454bd66d43a72736a75614a721.tar.xz | |
a few small changes
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 2fa0459..7ee0478 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
| @@ -986,15 +986,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 986 | if (terrain != null) | 986 | if (terrain != null) |
| 987 | { | 987 | { |
| 988 | byte[] data = terrain.WriteJpegImage("defaultstripe.png"); | 988 | byte[] data = terrain.WriteJpegImage("defaultstripe.png"); |
| 989 | m_regInfo.EstateSettings.terrainImageID = LLUUID.Random(); | 989 | if (data != null) |
| 990 | AssetBase asset = new AssetBase(); | 990 | { |
| 991 | asset.FullID = m_regInfo.EstateSettings.terrainImageID; | 991 | m_regInfo.EstateSettings.terrainImageID = LLUUID.Random(); |
| 992 | asset.Data = data; | 992 | AssetBase asset = new AssetBase(); |
| 993 | asset.Name = "terrainImage"; | 993 | asset.FullID = m_regInfo.EstateSettings.terrainImageID; |
| 994 | asset.Description = RegionInfo.RegionName; | 994 | asset.Data = data; |
| 995 | asset.Type = 0; | 995 | asset.Name = "terrainImage"; |
| 996 | asset.Temporary = temporary; | 996 | asset.Description = RegionInfo.RegionName; |
| 997 | AssetCache.AddAsset(asset); | 997 | asset.Type = 0; |
| 998 | asset.Temporary = temporary; | ||
| 999 | AssetCache.AddAsset(asset); | ||
| 1000 | } | ||
| 998 | } | 1001 | } |
| 999 | 1002 | ||
| 1000 | } | 1003 | } |