aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-08-03 22:03:04 +0100
committerJustin Clark-Casey (justincc)2012-08-03 22:03:04 +0100
commitfaffe2f2f9beda067d2e7bb68918c43bb55ef595 (patch)
tree717fa8fb0daeb3a27a30f45f287f7590f8654df4 /OpenSim/Region
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-faffe2f2f9beda067d2e7bb68918c43bb55ef595.zip
opensim-SC_OLD-faffe2f2f9beda067d2e7bb68918c43bb55ef595.tar.gz
opensim-SC_OLD-faffe2f2f9beda067d2e7bb68918c43bb55ef595.tar.bz2
opensim-SC_OLD-faffe2f2f9beda067d2e7bb68918c43bb55ef595.tar.xz
Fix the recent windows compile error by putting newFont for case "R" in VectorRenderModule inside its own context, rather than disposing of the old font before using it as a prototype for the new.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs11
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index 6b9f537..ca320e1 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -596,9 +596,14 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
596 } 596 }
597 break; 597 break;
598 case "R": 598 case "R":
599// Font newFont = new Font(myFont, FontStyle.Regular); 599 // We need to place this newFont inside its own context so that the .NET compiler
600 myFont.Dispose(); 600 // doesn't complain about a redefinition of an existing newFont, even though there is none
601 myFont = new Font(myFont, FontStyle.Regular); 601 // The mono compiler doesn't produce this error.
602 {
603 Font newFont = new Font(myFont, FontStyle.Regular);
604 myFont.Dispose();
605 myFont = newFont;
606 }
602 break; 607 break;
603 } 608 }
604 } 609 }