aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-12-05 21:37:41 +0000
committerJustin Clark-Casey (justincc)2012-12-05 21:40:28 +0000
commitd97440c7cf307ec701cc5351a0075239ece44727 (patch)
tree999db59d37beba42d716e10fa064492513ad2c63 /OpenSim/Region
parentminor: also comment out the debug log message which reports searching for chi... (diff)
downloadopensim-SC_OLD-d97440c7cf307ec701cc5351a0075239ece44727.zip
opensim-SC_OLD-d97440c7cf307ec701cc5351a0075239ece44727.tar.gz
opensim-SC_OLD-d97440c7cf307ec701cc5351a0075239ece44727.tar.bz2
opensim-SC_OLD-d97440c7cf307ec701cc5351a0075239ece44727.tar.xz
On XEngine.ProcessEventHandler(), instead of creating a new CultureInfo on every call use the single one set by Culture.SetCurrentCulture()
This is slightly different in that SetCurrentCulture() does not use overridden settings if the system culture matches en-US but some settings there have been changed. This is what we want - we do not want to use any system overriden settings.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 0460f22..1dab51e 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1415,8 +1415,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1415 /// <returns></returns> 1415 /// <returns></returns>
1416 private object ProcessEventHandler(object parms) 1416 private object ProcessEventHandler(object parms)
1417 { 1417 {
1418 CultureInfo USCulture = new CultureInfo("en-US"); 1418 Culture.SetCurrentCulture();
1419 Thread.CurrentThread.CurrentCulture = USCulture;
1420 1419
1421 IScriptInstance instance = (ScriptInstance) parms; 1420 IScriptInstance instance = (ScriptInstance) parms;
1422 1421