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/Services/AssetService/AssetService.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/Services/AssetService/AssetService.cs')
| -rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index 88a905c..ebfd47a 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
| @@ -155,7 +155,7 @@ namespace OpenSim.Services.AssetService | |||
| 155 | AssetBase asset = Get(args[2]); | 155 | AssetBase asset = Get(args[2]); |
| 156 | 156 | ||
| 157 | if (asset == null || asset.Data.Length == 0) | 157 | if (asset == null || asset.Data.Length == 0) |
| 158 | { | 158 | { |
| 159 | MainConsole.Instance.Output("Asset not found"); | 159 | MainConsole.Instance.Output("Asset not found"); |
| 160 | return; | 160 | return; |
| 161 | } | 161 | } |
| @@ -195,7 +195,7 @@ namespace OpenSim.Services.AssetService | |||
| 195 | AssetBase asset = Get(args[2]); | 195 | AssetBase asset = Get(args[2]); |
| 196 | 196 | ||
| 197 | if (asset == null || asset.Data.Length == 0) | 197 | if (asset == null || asset.Data.Length == 0) |
| 198 | { | 198 | { |
| 199 | MainConsole.Instance.Output("Asset not found"); | 199 | MainConsole.Instance.Output("Asset not found"); |
| 200 | return; | 200 | return; |
| 201 | } | 201 | } |