OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

0.7.4.1
Justin Clark-Casey (justincc) 2012-08-03 22:03:04 +01:00
parent 8327e048b9
commit faffe2f2f9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
View File

@ -596,9 +596,14 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
} }
break; break;
case "R": case "R":
// Font newFont = new Font(myFont, FontStyle.Regular); // We need to place this newFont inside its own context so that the .NET compiler
// doesn't complain about a redefinition of an existing newFont, even though there is none
// The mono compiler doesn't produce this error.
{
Font newFont = new Font(myFont, FontStyle.Regular);
myFont.Dispose(); myFont.Dispose();
myFont = new Font(myFont, FontStyle.Regular); myFont = newFont;
}
break; break;
} }
} }