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/Tests/GetAssetStreamHandlerTests.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_OLD-181b992b4a8dab3423b52f705e20dcb63e7fdb47.zip opensim-SC_OLD-181b992b4a8dab3423b52f705e20dcb63e7fdb47.tar.gz opensim-SC_OLD-181b992b4a8dab3423b52f705e20dcb63e7fdb47.tar.bz2 opensim-SC_OLD-181b992b4a8dab3423b52f705e20dcb63e7fdb47.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs')
-rw-r--r-- | OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs index 35da73f..be3f518 100644 --- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs +++ b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs | |||
@@ -128,7 +128,7 @@ namespace OpenSim.Framework.Servers.Tests | |||
128 | IAssetDataPlugin assetDataPlugin = new TestAssetDataPlugin(); | 128 | IAssetDataPlugin assetDataPlugin = new TestAssetDataPlugin(); |
129 | handler = new GetAssetStreamHandler(assetDataPlugin); | 129 | handler = new GetAssetStreamHandler(assetDataPlugin); |
130 | 130 | ||
131 | assetDataPlugin.CreateAsset(asset); | 131 | assetDataPlugin.StoreAsset(asset); |
132 | return asset; | 132 | return asset; |
133 | } | 133 | } |
134 | } | 134 | } |