diff options
author | Melanie | 2012-10-20 02:33:24 +0100 |
---|---|---|
committer | Melanie | 2012-10-20 02:33:24 +0100 |
commit | 6ad8d3c43f130dfb80a7543e139ffa4dacb840ad (patch) | |
tree | 24baeecab6becf3bb30c26046ea95b75e6bbdc0f /OpenSim/Region/Framework/Scenes | |
parent | Merge branch 'master' into careminster (diff) | |
parent | minor: Rename assetCache constructor param in UUIDGatherer to assetService wh... (diff) | |
download | opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.zip opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.gz opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.bz2 opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index b5ef7b0..2279e62 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |||
@@ -66,9 +66,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
66 | // /// </summary> | 66 | // /// </summary> |
67 | // private bool m_waitingForObjectAsset; | 67 | // private bool m_waitingForObjectAsset; |
68 | 68 | ||
69 | public UuidGatherer(IAssetService assetCache) | 69 | public UuidGatherer(IAssetService assetService) |
70 | { | 70 | { |
71 | m_assetService = assetCache; | 71 | m_assetService = assetService; |
72 | } | 72 | } |
73 | 73 | ||
74 | /// <summary> | 74 | /// <summary> |