aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-05-27 21:19:20 +0100
committerJustin Clark-Casey (justincc)2011-05-27 21:58:44 +0100
commit951ede7626572eccb73088c166fb53e4ef06afad (patch)
tree721c321b67516ca443d2f0543ff360ac9df08fe8
parentIf parsing fails in the primitive base shape (which prints out a debug log me... (diff)
downloadopensim-SC_OLD-951ede7626572eccb73088c166fb53e4ef06afad.zip
opensim-SC_OLD-951ede7626572eccb73088c166fb53e4ef06afad.tar.gz
opensim-SC_OLD-951ede7626572eccb73088c166fb53e4ef06afad.tar.bz2
opensim-SC_OLD-951ede7626572eccb73088c166fb53e4ef06afad.tar.xz
Make sure culture is en-US when saving archive related xml.
This might resolve http://opensimulator.org/mantis/view.php?id=5475
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs1
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index b888698..3078ab3 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -230,6 +230,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
230 /// <param name="asset"></param> 230 /// <param name="asset"></param>
231 public void AssetRequestCallback(string id, object sender, AssetBase asset) 231 public void AssetRequestCallback(string id, object sender, AssetBase asset)
232 { 232 {
233 Culture.SetCurrentCulture();
234
233 try 235 try
234 { 236 {
235 lock (this) 237 lock (this)
@@ -293,6 +295,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
293 /// </summary> 295 /// </summary>
294 protected void PerformAssetsRequestCallback(object o) 296 protected void PerformAssetsRequestCallback(object o)
295 { 297 {
298 Culture.SetCurrentCulture();
299
296 try 300 try
297 { 301 {
298 m_assetsRequestCallback(m_foundAssetUuids, m_notFoundAssetUuids); 302 m_assetsRequestCallback(m_foundAssetUuids, m_notFoundAssetUuids);
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 0440c99..fd0f429 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -121,7 +121,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
121 } 121 }
122 } 122 }
123 123
124
125 /// <summary> 124 /// <summary>
126 /// Serialize a scene object to the original xml format 125 /// Serialize a scene object to the original xml format
127 /// </summary> 126 /// </summary>