aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-28 20:29:56 +0000
committerMelanie Thielker2008-09-28 20:29:56 +0000
commitc2308d8a7d8a80d04bd7b070cb1b2f9c8b00afa7 (patch)
tree33d6396ae1586fdacb0be47c12aa5b6ef5fbefc8
parentPlumb the connection though from llSetVehicleVectorParam (diff)
downloadopensim-SC_OLD-c2308d8a7d8a80d04bd7b070cb1b2f9c8b00afa7.zip
opensim-SC_OLD-c2308d8a7d8a80d04bd7b070cb1b2f9c8b00afa7.tar.gz
opensim-SC_OLD-c2308d8a7d8a80d04bd7b070cb1b2f9c8b00afa7.tar.bz2
opensim-SC_OLD-c2308d8a7d8a80d04bd7b070cb1b2f9c8b00afa7.tar.xz
Add explicit CultureInfo to the script compile thread in DotNetEngine to
ensure that scripts will compile on nonenglish systems
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs4
3 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
index 60fdf39..4bd0b45 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
@@ -63,6 +63,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
63 63
64 public EventQueueThreadClass()//EventQueueManager eqm 64 public EventQueueThreadClass()//EventQueueManager eqm
65 { 65 {
66 CultureInfo USCulture = new CultureInfo("en-US");
67 Thread.CurrentThread.CurrentCulture = USCulture;
68
66 //eventQueueManager = eqm; 69 //eventQueueManager = eqm;
67 ReadConfig(); 70 ReadConfig();
68 Start(); 71 Start();
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 7ba1a83..627b2a7 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using System.Globalization;
30using log4net; 31using log4net;
31using OpenMetaverse; 32using OpenMetaverse;
32using OpenSim.Framework; 33using OpenSim.Framework;
@@ -140,6 +141,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
140 ScenePresence presence = 141 ScenePresence presence =
141 World.GetScenePresence(taskInventoryItem.OwnerID); 142 World.GetScenePresence(taskInventoryItem.OwnerID);
142 143
144 CultureInfo USCulture = new CultureInfo("en-US");
145 Thread.CurrentThread.CurrentCulture = USCulture;
146
143 try 147 try
144 { 148 {
145 // Compile (We assume LSL) 149 // Compile (We assume LSL)
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 6bafd69..1833d5c 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -496,6 +496,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
496 ScenePresence presence = m_Scene.GetScenePresence(item.OwnerID); 496 ScenePresence presence = m_Scene.GetScenePresence(item.OwnerID);
497 497
498 string assembly = ""; 498 string assembly = "";
499
500 CultureInfo USCulture = new CultureInfo("en-US");
501 Thread.CurrentThread.CurrentCulture = USCulture;
502
499 try 503 try
500 { 504 {
501 assembly = m_Compiler.PerformScriptCompile(script, 505 assembly = m_Compiler.PerformScriptCompile(script,