diff options
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | 2 |
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 | |||
51 | private Scene m_scene; | 51 | private Scene m_scene; |
52 | private IDynamicTextureManager m_textureManager; | 52 | private IDynamicTextureManager m_textureManager; |
53 | private Graphics m_graph; | 53 | private Graphics m_graph; |
54 | private string m_fontName = "Arial"; | ||
54 | 55 | ||
55 | public VectorRenderModule() | 56 | public VectorRenderModule() |
56 | { | 57 | { |
@@ -123,6 +124,13 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
123 | Bitmap bitmap = new Bitmap(1024, 1024, PixelFormat.Format32bppArgb); | 124 | Bitmap bitmap = new Bitmap(1024, 1024, PixelFormat.Format32bppArgb); |
124 | m_graph = Graphics.FromImage(bitmap); | 125 | m_graph = Graphics.FromImage(bitmap); |
125 | } | 126 | } |
127 | |||
128 | IConfig cfg = config.Configs["VectorRender"]; | ||
129 | if (null != cfg) | ||
130 | { | ||
131 | m_fontName = cfg.GetString("font_name", m_fontName); | ||
132 | } | ||
133 | m_log.DebugFormat("[VECTORRENDERMODULE]: using font \"{0}\" for text rendering.", m_fontName); | ||
126 | } | 134 | } |
127 | 135 | ||
128 | public void PostInitialise() | 136 | public void PostInitialise() |
@@ -397,7 +405,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
397 | Point startPoint = new Point(0, 0); | 405 | Point startPoint = new Point(0, 0); |
398 | Point endPoint = new Point(0, 0); | 406 | Point endPoint = new Point(0, 0); |
399 | Pen drawPen = new Pen(Color.Black, 7); | 407 | Pen drawPen = new Pen(Color.Black, 7); |
400 | string fontName = "Arial"; | 408 | string fontName = m_fontName; |
401 | float fontSize = 14; | 409 | float fontSize = 14; |
402 | Font myFont = new Font(fontName, fontSize); | 410 | Font myFont = new Font(fontName, fontSize); |
403 | SolidBrush myBrush = new SolidBrush(Color.Black); | 411 | SolidBrush myBrush = new SolidBrush(Color.Black); |
@@ -449,8 +457,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
449 | } | 457 | } |
450 | else | 458 | else |
451 | { | 459 | { |
452 | graph.DrawString("URL couldn't be resolved or is", new Font("Arial",6), myBrush, startPoint); | 460 | graph.DrawString("URL couldn't be resolved or is", new Font(m_fontName,6), |
453 | graph.DrawString("not an image. Please check URL.", new Font("Arial", 6), myBrush, new Point(startPoint.X, 12 + startPoint.Y)); | 461 | myBrush, startPoint); |
462 | graph.DrawString("not an image. Please check URL.", new Font(m_fontName, 6), | ||
463 | myBrush, new Point(startPoint.X, 12 + startPoint.Y)); | ||
454 | graph.DrawRectangle(drawPen, startPoint.X, startPoint.Y, endPoint.X, endPoint.Y); | 464 | graph.DrawRectangle(drawPen, startPoint.X, startPoint.Y, endPoint.X, endPoint.Y); |
455 | } | 465 | } |
456 | startPoint.X += endPoint.X; | 466 | 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 | |||
20 | get { return null; } | 20 | get { return null; } |
21 | } | 21 | } |
22 | 22 | ||
23 | public Type ReplacableInterface { get { return null; } } | ||
24 | |||
25 | private Dictionary<UUID, RegionConnections> m_regions = new Dictionary<UUID, RegionConnections>(); | 23 | private Dictionary<UUID, RegionConnections> m_regions = new Dictionary<UUID, RegionConnections>(); |
26 | private bool enabledYN = false; | 24 | private bool enabledYN = false; |
27 | public void Initialise(IConfigSource source) | 25 | public void Initialise(IConfigSource source) |