Merge branch 'master' into careminster-presence-refactor

2026-08-11 20:05:33 +08:00 · 2011-06-09 02:05:04 +01:00
parent a41051f1dd 49e4e53928
commit 326c46ba70
119 changed files with 6471 additions and 4318 deletions
--- 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
        /// <param name="asset"></param>
        public void AssetRequestCallback(string id, object sender, AssetBase asset)
        {
+            Culture.SetCurrentCulture();
+            
            try
            {
                lock (this)
@@ -289,6 +291,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
        /// </summary>
        protected void PerformAssetsRequestCallback(object o)
        {
+            Culture.SetCurrentCulture();
+
            try
            {
                m_assetsRequestCallback(m_foundAssetUuids, m_notFoundAssetUuids);