Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

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 d039111..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
                                     }
                                     break;
                                 case "R":
-                                    Font newFont = new Font(myFont, FontStyle.Regular);
-                                    myFont.Dispose();
-                                    myFont = newFont;
+                                    // 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 = newFont;
+                                    }
                                     break;
                             }
                         }