aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-08-03 21:56:48 +0100
committerJustin Clark-Casey (justincc)2012-08-03 21:56:48 +0100
commit8327e048b916fc7b6f3ed173dea2837b855c3ac1 (patch)
treec8aafceb489b297ee4d271e23793345e1864ede8 /OpenSim/Region
parentMove previously unadvertised SendPeriodicAppearanceUpdates setting from [Star... (diff)
parentattempting to fix a build issue (diff)
downloadopensim-SC_OLD-8327e048b916fc7b6f3ed173dea2837b855c3ac1.zip
opensim-SC_OLD-8327e048b916fc7b6f3ed173dea2837b855c3ac1.tar.gz
opensim-SC_OLD-8327e048b916fc7b6f3ed173dea2837b855c3ac1.tar.bz2
opensim-SC_OLD-8327e048b916fc7b6f3ed173dea2837b855c3ac1.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index d039111..6b9f537 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -596,9 +596,9 @@ 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// Font newFont = new Font(myFont, FontStyle.Regular);
600 myFont.Dispose(); 600 myFont.Dispose();
601 myFont = newFont; 601 myFont = new Font(myFont, FontStyle.Regular);
602 break; 602 break;
603 } 603 }
604 } 604 }