diff options
| author | Melanie | 2011-06-09 02:05:04 +0100 |
|---|---|---|
| committer | Melanie | 2011-06-09 02:05:04 +0100 |
| commit | 326c46ba70cea70ddfe4aef9a6b73edff63e126a (patch) | |
| tree | 5e76347b0d77f58717d8e5e4f3b8787ff01a18d7 /OpenSim/Region/CoreModules/World/Archiver | |
| parent | Make the last otem in a list created with llCSV2List findable (diff) | |
| parent | Consistency fix on the last commit. (diff) | |
| download | opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.zip opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.gz opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.bz2 opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index 5da1656..eb00de8 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) |
| @@ -289,6 +291,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 289 | /// </summary> | 291 | /// </summary> |
| 290 | protected void PerformAssetsRequestCallback(object o) | 292 | protected void PerformAssetsRequestCallback(object o) |
| 291 | { | 293 | { |
| 294 | Culture.SetCurrentCulture(); | ||
| 295 | |||
| 292 | try | 296 | try |
| 293 | { | 297 | { |
| 294 | m_assetsRequestCallback(m_foundAssetUuids, m_notFoundAssetUuids); | 298 | m_assetsRequestCallback(m_foundAssetUuids, m_notFoundAssetUuids); |