aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
diff options
context:
space:
mode:
authorDiva Canto2009-08-19 17:36:34 -0700
committerDiva Canto2009-08-19 17:36:34 -0700
commita3db2936f7b9297815244d39cdb33c26d17c70e2 (patch)
tree6f5c6626f94f878a020412f348dcbc51aadd2312 /OpenSim/Framework/Servers/GetAssetStreamHandler.cs
parentFixes GetItem and GetFolder for SQLite. Turns out some methods were no-op in ... (diff)
parentFixing a spot I missed in assets. Switching Grid to the new naming schema wit... (diff)
downloadopensim-SC_OLD-a3db2936f7b9297815244d39cdb33c26d17c70e2.zip
opensim-SC_OLD-a3db2936f7b9297815244d39cdb33c26d17c70e2.tar.gz
opensim-SC_OLD-a3db2936f7b9297815244d39cdb33c26d17c70e2.tar.bz2
opensim-SC_OLD-a3db2936f7b9297815244d39cdb33c26d17c70e2.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/GetAssetStreamHandler.cs')
-rw-r--r--OpenSim/Framework/Servers/GetAssetStreamHandler.cs2
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}