From e9988a3728706e346dfb869de554a24e6a3b0a79 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 27 May 2011 21:19:20 +0100 Subject: Make sure culture is en-US when saving archive related xml. This might resolve http://opensimulator.org/mantis/view.php?id=5475 --- OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 4 ++++ .../Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'OpenSim') 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 /// public void AssetRequestCallback(string id, object sender, AssetBase asset) { + Culture.SetCurrentCulture(); + try { lock (this) @@ -293,6 +295,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver /// protected void PerformAssetsRequestCallback(object o) { + Culture.SetCurrentCulture(); + try { 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 47af0dd..6ae4f38 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 } } - /// /// Serialize a scene object to the original xml format /// -- cgit v1.1