diff options
author | Diva Canto | 2009-08-14 14:04:15 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-14 14:04:15 -0700 |
commit | cd444c1e82dcf7929cc34e00a66bc16998c3d90c (patch) | |
tree | 24a2495ea19c5a2e258582fc3db8407dfc1c86be /OpenSim/Tests | |
parent | Returning UUID.Zero is scene and user profile service are null in GetSession.... (diff) | |
parent | * Re-enable TestLoadIarV0_1ExistingUsers() (diff) | |
download | opensim-SC-cd444c1e82dcf7929cc34e00a66bc16998c3d90c.zip opensim-SC-cd444c1e82dcf7929cc34e00a66bc16998c3d90c.tar.gz opensim-SC-cd444c1e82dcf7929cc34e00a66bc16998c3d90c.tar.bz2 opensim-SC-cd444c1e82dcf7929cc34e00a66bc16998c3d90c.tar.xz |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestAssetService.cs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestAssetService.cs b/OpenSim/Tests/Common/Mock/TestAssetService.cs index 5f1184b..81f123a 100644 --- a/OpenSim/Tests/Common/Mock/TestAssetService.cs +++ b/OpenSim/Tests/Common/Mock/TestAssetService.cs | |||
@@ -45,7 +45,13 @@ namespace OpenSim.Tests.Common.Mock | |||
45 | 45 | ||
46 | public AssetBase Get(string id) | 46 | public AssetBase Get(string id) |
47 | { | 47 | { |
48 | return Assets[ id ]; | 48 | AssetBase asset; |
49 | if (Assets.ContainsKey(id)) | ||
50 | asset = Assets[id]; | ||
51 | else | ||
52 | asset = null; | ||
53 | |||
54 | return asset; | ||
49 | } | 55 | } |
50 | 56 | ||
51 | public AssetMetadata GetMetadata(string id) | 57 | public AssetMetadata GetMetadata(string id) |
@@ -59,8 +65,10 @@ namespace OpenSim.Tests.Common.Mock | |||
59 | } | 65 | } |
60 | 66 | ||
61 | public bool Get(string id, object sender, AssetRetrieved handler) | 67 | public bool Get(string id, object sender, AssetRetrieved handler) |
62 | { | 68 | { |
63 | throw new NotImplementedException(); | 69 | handler(id, sender, Get(id)); |
70 | |||
71 | return true; | ||
64 | } | 72 | } |
65 | 73 | ||
66 | public string Store(AssetBase asset) | 74 | public string Store(AssetBase asset) |