diff options
| author | John Hurliman | 2009-09-30 15:28:23 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
| commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
| tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Tests/Common/Mock/TestAssetService.cs | |
| parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests/Common/Mock/TestAssetService.cs')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestAssetService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestAssetService.cs b/OpenSim/Tests/Common/Mock/TestAssetService.cs index 81f123a..317ec06 100644 --- a/OpenSim/Tests/Common/Mock/TestAssetService.cs +++ b/OpenSim/Tests/Common/Mock/TestAssetService.cs | |||
| @@ -49,7 +49,7 @@ namespace OpenSim.Tests.Common.Mock | |||
| 49 | if (Assets.ContainsKey(id)) | 49 | if (Assets.ContainsKey(id)) |
| 50 | asset = Assets[id]; | 50 | asset = Assets[id]; |
| 51 | else | 51 | else |
| 52 | asset = null; | 52 | asset = null; |
| 53 | 53 | ||
| 54 | return asset; | 54 | return asset; |
| 55 | } | 55 | } |
| @@ -65,7 +65,7 @@ namespace OpenSim.Tests.Common.Mock | |||
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | public bool Get(string id, object sender, AssetRetrieved handler) | 67 | public bool Get(string id, object sender, AssetRetrieved handler) |
| 68 | { | 68 | { |
| 69 | handler(id, sender, Get(id)); | 69 | handler(id, sender, Get(id)); |
| 70 | 70 | ||
| 71 | return true; | 71 | return true; |