Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

2 files changed, 13 insertions, 5 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index e83b1a8..bea6222 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -51,6 +51,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
         private Scene m_scene;
         private IDynamicTextureManager m_textureManager;
         private Graphics m_graph;
+        private string m_fontName = "Arial";
 
         public VectorRenderModule()
         {
@@ -123,6 +124,13 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                 Bitmap bitmap = new Bitmap(1024, 1024, PixelFormat.Format32bppArgb);
                 m_graph = Graphics.FromImage(bitmap);
             }
+
+            IConfig cfg = config.Configs["VectorRender"];
+            if (null != cfg)
+            {
+                m_fontName = cfg.GetString("font_name", m_fontName);
+            }
+            m_log.DebugFormat("[VECTORRENDERMODULE]: using font \"{0}\" for text rendering.", m_fontName);
         }
 
         public void PostInitialise()
@@ -397,7 +405,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
             Point startPoint = new Point(0, 0);
             Point endPoint = new Point(0, 0);
             Pen drawPen = new Pen(Color.Black, 7);
-            string fontName = "Arial";
+            string fontName = m_fontName;
             float fontSize = 14;
             Font myFont = new Font(fontName, fontSize);
             SolidBrush myBrush = new SolidBrush(Color.Black);
@@ -449,8 +457,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                     }
                     else
                     {
-                        graph.DrawString("URL couldn't be resolved or is", new Font("Arial",6), myBrush, startPoint);
-                        graph.DrawString("not an image. Please check URL.", new Font("Arial", 6), myBrush, new Point(startPoint.X, 12 + startPoint.Y));
+                        graph.DrawString("URL couldn't be resolved or is", new Font(m_fontName,6), 
+                                         myBrush, startPoint);
+                        graph.DrawString("not an image. Please check URL.", new Font(m_fontName, 6), 
+                                         myBrush, new Point(startPoint.X, 12 + startPoint.Y));
                         graph.DrawRectangle(drawPen, startPoint.X, startPoint.Y, endPoint.X, endPoint.Y);
                     }
                     startPoint.X += endPoint.X;
diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
index 79c9839..a6e3859 100644
--- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
@@ -20,8 +20,6 @@ namespace OpenSim.Region.CoreModules.World.Land
             get { return null; }
         }
 
-        public Type ReplacableInterface { get { return null; } }
-
         private Dictionary<UUID, RegionConnections> m_regions = new Dictionary<UUID, RegionConnections>();
         private bool enabledYN = false;
         public void Initialise(IConfigSource source)