diff options
| author | BlueWall | 2012-10-20 04:32:45 -0400 |
|---|---|---|
| committer | BlueWall | 2012-10-20 04:32:45 -0400 |
| commit | af9cd7d30cc3926242338da2ed66c7cc444c6240 (patch) | |
| tree | 80d8eea5b0d6d70deeb65ae6d6736648110f15b4 /OpenSim/Region/Framework | |
| parent | Add CLICK_ACTION_ZOOM (diff) | |
| parent | minor: remove unnecessary bit of method doc from OdePrim.BadMeshAssetCollideB... (diff) | |
| download | opensim-SC-af9cd7d30cc3926242338da2ed66c7cc444c6240.zip opensim-SC-af9cd7d30cc3926242338da2ed66c7cc444c6240.tar.gz opensim-SC-af9cd7d30cc3926242338da2ed66c7cc444c6240.tar.bz2 opensim-SC-af9cd7d30cc3926242338da2ed66c7cc444c6240.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -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 28cd09f..e238d01 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> |