aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-10-11 23:08:18 +0100
committerMelanie2011-10-11 23:08:18 +0100
commitb9826035f6b94c6d8f74cb34e561f4d046fdcf81 (patch)
treece6ac060d5d92c9bbe616d6f10318948dc53b338
parentMerge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmerge (diff)
parentAdd en_US culture setting to the async delete to inventory thread, to avoid a... (diff)
downloadopensim-SC_OLD-b9826035f6b94c6d8f74cb34e561f4d046fdcf81.zip
opensim-SC_OLD-b9826035f6b94c6d8f74cb34e561f4d046fdcf81.tar.gz
opensim-SC_OLD-b9826035f6b94c6d8f74cb34e561f4d046fdcf81.tar.bz2
opensim-SC_OLD-b9826035f6b94c6d8f74cb34e561f4d046fdcf81.tar.xz
Merge commit 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmerge
-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 088839d..12688bd 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -119,6 +119,11 @@ namespace OpenSim.Region.Framework.Scenes
119 private void InventoryRunDeleteTimer(object sender, ElapsedEventArgs e) 119 private void InventoryRunDeleteTimer(object sender, ElapsedEventArgs e)
120 { 120 {
121 m_log.Debug("[ASYNC DELETER]: Starting send to inventory loop"); 121 m_log.Debug("[ASYNC DELETER]: Starting send to inventory loop");
122
123 // We must set appearance parameters in the en_US culture in order to avoid issues where values are saved
124 // in a culture where decimal points are commas and then reloaded in a culture which just treats them as
125 // number seperators.
126 Culture.SetCurrentCulture();
122 127
123 while (InventoryDeQueueAndDelete()) 128 while (InventoryDeQueueAndDelete())
124 { 129 {