diff options
author | diva | 2009-05-23 17:51:13 +0000 |
---|---|---|
committer | diva | 2009-05-23 17:51:13 +0000 |
commit | fb6d314d4db0a157799a1d49a5f467f1c051ec9b (patch) | |
tree | 3a5f7c8d3f91722d6a32ee85b7031dfb4c2de6b0 /OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |
parent | Added one missing config var for HG standalones. (diff) | |
download | opensim-SC_OLD-fb6d314d4db0a157799a1d49a5f467f1c051ec9b.zip opensim-SC_OLD-fb6d314d4db0a157799a1d49a5f467f1c051ec9b.tar.gz opensim-SC_OLD-fb6d314d4db0a157799a1d49a5f467f1c051ec9b.tar.bz2 opensim-SC_OLD-fb6d314d4db0a157799a1d49a5f467f1c051ec9b.tar.xz |
This should make HG asset transfers work much better. It now uses HGUuidGatherer, which is a subclass of UuidGatherer. Hence, on-line HG asset transfers use exactly the same UUID collection code as save oar/xml. If it doesn't work, it's Justin's fault :D
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/UuidGatherer.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index 5eb42f7..1324978 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |||
@@ -187,7 +187,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
187 | /// </summary> | 187 | /// </summary> |
188 | /// <param name="uuid"></param> | 188 | /// <param name="uuid"></param> |
189 | /// <returns></returns> | 189 | /// <returns></returns> |
190 | protected AssetBase GetAsset(UUID uuid) | 190 | protected virtual AssetBase GetAsset(UUID uuid) |
191 | { | 191 | { |
192 | m_waitingForObjectAsset = true; | 192 | m_waitingForObjectAsset = true; |
193 | m_assetCache.Get(uuid.ToString(), this, AssetReceived); | 193 | m_assetCache.Get(uuid.ToString(), this, AssetReceived); |