diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-20 19:25:52 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-20 19:25:52 -0400 |
| commit | 181b992b4a8dab3423b52f705e20dcb63e7fdb47 (patch) | |
| tree | 309f2255464873944a5478472596cbc24b130b27 /OpenSim/Framework/Servers/GetAssetStreamHandler.cs | |
| parent | * Deal with git thinking that file was changed even though it wasn't and it's... (diff) | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-181b992b4a8dab3423b52f705e20dcb63e7fdb47.zip opensim-SC-181b992b4a8dab3423b52f705e20dcb63e7fdb47.tar.gz opensim-SC-181b992b4a8dab3423b52f705e20dcb63e7fdb47.tar.bz2 opensim-SC-181b992b4a8dab3423b52f705e20dcb63e7fdb47.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/GetAssetStreamHandler.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/GetAssetStreamHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs index bc046cf..c6958de 100644 --- a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs +++ b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs | |||
| @@ -57,7 +57,7 @@ namespace OpenSim.Framework.Servers | |||
| 57 | 57 | ||
| 58 | protected override AssetBase GetAsset(UUID assetID) | 58 | protected override AssetBase GetAsset(UUID assetID) |
| 59 | { | 59 | { |
| 60 | return m_assetProvider.FetchAsset(assetID); | 60 | return m_assetProvider.GetAsset(assetID); |
| 61 | } | 61 | } |
| 62 | } | 62 | } |
| 63 | } | 63 | } |