aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-26 23:00:16 +0100
committerJustin Clark-Casey (justincc)2011-10-07 20:27:31 +0100
commit94f49e859bb82dfefe010b6ac145dbbc8ab9b45a (patch)
tree735bab3b0a10fc9633c7ec869ede87d64a6530c3
parentFix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates ar... (diff)
downloadopensim-SC_OLD-94f49e859bb82dfefe010b6ac145dbbc8ab9b45a.zip
opensim-SC_OLD-94f49e859bb82dfefe010b6ac145dbbc8ab9b45a.tar.gz
opensim-SC_OLD-94f49e859bb82dfefe010b6ac145dbbc8ab9b45a.tar.bz2
opensim-SC_OLD-94f49e859bb82dfefe010b6ac145dbbc8ab9b45a.tar.xz
Add en_US culture setting to the async delete to inventory thread, to avoid any issues with float serialization with machines set to non en_US locales.
Doing this to see if addresses inventory object deserialization problems in http://opensimulator.org/mantis/view.php?id=5708, though if it does I'm really surprised not to have seen it before now. Really need to go through and systematically set the culture for every timer and change all BeginInvoke calls to FireAndForget instead. But don't want to do something like that this close to a release.
-rw-r--r--OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 3423542..0ac3899 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -112,6 +112,11 @@ namespace OpenSim.Region.Framework.Scenes
112 private void InventoryRunDeleteTimer(object sender, ElapsedEventArgs e) 112 private void InventoryRunDeleteTimer(object sender, ElapsedEventArgs e)
113 { 113 {
114 m_log.Debug("[ASYNC DELETER]: Starting send to inventory loop"); 114 m_log.Debug("[ASYNC DELETER]: Starting send to inventory loop");
115
116 // We must set appearance parameters in the en_US culture in order to avoid issues where values are saved
117 // in a culture where decimal points are commas and then reloaded in a culture which just treats them as
118 // number seperators.
119 Culture.SetCurrentCulture();
115 120
116 while (InventoryDeQueueAndDelete()) 121 while (InventoryDeQueueAndDelete())
117 { 122 {