Merge branch 'master' of git://opensimulator.org/git/opensim

OpenSim/Framework/RegionInfo.cs

@@ -143,6 +143,7 @@ namespace OpenSim.Framework
         public UUID RegionID = UUID.Zero;
         public string RemotingAddress;
         public UUID ScopeID = UUID.Zero;
+        private UUID m_maptileStaticUUID = UUID.Zero;
 
         private Dictionary<String, String> m_otherSettings = new Dictionary<string, string>();
 
@@ -338,6 +339,11 @@ namespace OpenSim.Framework
             get { return m_regionType; }
         }
 
+        public UUID MaptileStaticUUID
+        {
+            get { return m_maptileStaticUUID; }
+        }
+        
         /// <summary>
         /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
         /// </summary>
@@ -641,7 +647,7 @@ namespace OpenSim.Framework
             m_regionType = config.GetString("RegionType", String.Empty);
             allKeys.Remove("RegionType");
 
-            #region Prim stuff
+            #region Prim and map stuff
 
             m_nonphysPrimMin = config.GetFloat("NonPhysicalPrimMin", 0);
             allKeys.Remove("NonPhysicalPrimMin");
@@ -664,6 +670,13 @@ namespace OpenSim.Framework
             m_linksetCapacity = config.GetInt("LinksetPrims", 0);
             allKeys.Remove("LinksetPrims");
 
+            allKeys.Remove("MaptileStaticUUID");
+            string mapTileStaticUUID = config.GetString("MaptileStaticUUID", UUID.Zero.ToString());
+            if (UUID.TryParse(mapTileStaticUUID.Trim(), out m_maptileStaticUUID))
+            {
+                config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString()); 
+            }
+            
             #endregion
 
             m_agentCapacity = config.GetInt("MaxAgents", 100);
@@ -729,6 +742,9 @@ namespace OpenSim.Framework
 
             if (RegionType != String.Empty)
                 config.Set("RegionType", RegionType);
+
+            if (m_maptileStaticUUID != UUID.Zero)
+                config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString());
         }
 
         public bool ignoreIncomingConfiguration(string configuration_key, object configuration_result)
@@ -827,6 +843,9 @@ namespace OpenSim.Framework
 
             configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Free form string describing the type of region", String.Empty, true);
+            
+            configMember.addConfigurationOption("region_static_maptile", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
+                                                "UUID of a texture to use as the map for this region", m_maptileStaticUUID.ToString(), true);
         }
 
         public void loadConfigurationOptions()
@@ -880,6 +899,9 @@ namespace OpenSim.Framework
 
             configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Region Type", String.Empty, true);
+
+            configMember.addConfigurationOption("region_static_maptile", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
+                                                "UUID of a texture to use as the map for this region", String.Empty, true);
         }
 
         public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -949,6 +971,9 @@ namespace OpenSim.Framework
                 case "region_type":
                     m_regionType = (string)configuration_result;
                     break;
+                case "region_static_maptile":
+                    m_maptileStaticUUID = (UUID)configuration_result;
+                    break;
             }
 
             return true;

OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs

@@ -77,18 +77,23 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
         {
             bool drawPrimVolume = true;
             bool textureTerrain = false;
+            bool generateMaptiles = true;
+            Bitmap mapbmp;
 
             try
             {
                 IConfig startupConfig = m_config.Configs["Startup"];
                 drawPrimVolume = startupConfig.GetBoolean("DrawPrimOnMapTile", drawPrimVolume);
                 textureTerrain = startupConfig.GetBoolean("TextureOnMapTile", textureTerrain);
+                generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", generateMaptiles);
             }
             catch
             {
                 m_log.Warn("[MAPTILE]: Failed to load StartupConfig");
             }
 
+            if (generateMaptiles)
+            {
                 if (textureTerrain)
                 {
                     terrainRenderer = new TexturedMapTileRenderer();
@@ -97,9 +102,10 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                 {
                     terrainRenderer = new ShadedMapTileRenderer();
                 }
+
                 terrainRenderer.Initialise(m_scene, m_config);
 
-            Bitmap mapbmp = new Bitmap((int)Constants.RegionSize, (int)Constants.RegionSize, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
+                mapbmp = new Bitmap((int)Constants.RegionSize, (int)Constants.RegionSize, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
                 //long t = System.Environment.TickCount;
                 //for (int i = 0; i < 10; ++i) {
                 terrainRenderer.TerrainToBitmap(mapbmp);
@@ -112,7 +118,11 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                 {
                     DrawObjectVolume(m_scene, mapbmp);
                 }
-
+            }
+            else
+            {
+                mapbmp = fetchTexture(m_scene.RegionInfo.RegionSettings.TerrainImageID);
+            }
             return mapbmp;
         }
 
@@ -222,6 +232,41 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 //             }
 //         }
 
+        private Bitmap fetchTexture(UUID id)
+        {
+            AssetBase asset = m_scene.AssetService.Get(id.ToString());
+            m_log.DebugFormat("[MAPTILE]: Fetched static texture {0}, found: {1}", id, asset != null);
+            if (asset == null) return null;
+
+            ManagedImage managedImage;
+            Image image;
+
+            try
+            {
+                if (OpenJPEG.DecodeToImage(asset.Data, out managedImage, out image))
+                    return new Bitmap(image);
+                else
+                    return null;
+            }
+            catch (DllNotFoundException)
+            {
+                m_log.ErrorFormat("[MAPTILE]: OpenJpeg is not installed correctly on this system.   Asset Data is empty for {0}", id);
+
+            }
+            catch (IndexOutOfRangeException)
+            {
+                m_log.ErrorFormat("[MAPTILE]: OpenJpeg was unable to decode this.   Asset Data is empty for {0}", id);
+
+            }
+            catch (Exception)
+            {
+                m_log.ErrorFormat("[MAPTILE]: OpenJpeg was unable to decode this.   Asset Data is empty for {0}", id);
+
+            }
+            return null;
+
+        }
+
         private Bitmap DrawObjectVolume(Scene whichScene, Bitmap mapbmp)
         {
             int tc = 0;

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -917,10 +917,15 @@ namespace OpenSim.Region.Framework.Scenes
                     string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString());
                     UUID tileID;
 
-                    if (UUID.TryParse(tile, out tileID))
+                    if ((tile!=UUID.Zero.ToString()) && UUID.TryParse(tile, out tileID))
                     {
                         RegionInfo.RegionSettings.TerrainImageID = tileID;
                     }
+                    else
+                    {
+                        RegionInfo.RegionSettings.TerrainImageID = RegionInfo.MaptileStaticUUID;
+                        m_log.InfoFormat("[SCENE]: Region {0}, maptile set to {1}", RegionInfo.RegionName, RegionInfo.MaptileStaticUUID.ToString());
+                    }
                 }
 
                 string grant = startupConfig.GetString("AllowedClients", String.Empty);

bin/Regions/Regions.ini.example

@@ -45,3 +45,4 @@ ExternalHostName = "SYSTEMIP"
 ; *
 
 ; RegionType = "Mainland"
+; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"