diff options
author | Diva Canto | 2012-09-21 06:41:32 -0700 |
---|---|---|
committer | Diva Canto | 2012-09-21 06:41:32 -0700 |
commit | 5f97b3e1d9775a88c1d952f1d599254969a262d2 (patch) | |
tree | ba76e577fec864aade67fcfcd8f9000599d90739 | |
parent | Improvement over last commit: refactor the asset permissions code, so that it... (diff) | |
download | opensim-SC_OLD-5f97b3e1d9775a88c1d952f1d599254969a262d2.zip opensim-SC_OLD-5f97b3e1d9775a88c1d952f1d599254969a262d2.tar.gz opensim-SC_OLD-5f97b3e1d9775a88c1d952f1d599254969a262d2.tar.bz2 opensim-SC_OLD-5f97b3e1d9775a88c1d952f1d599254969a262d2.tar.xz |
Minor: change the return value of unsuccessful posts to string.Empty.
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/HypergridService/HGAssetService.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs index fcecbbc..144cc87 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs | |||
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
113 | asset1.Data = asset.Data; | 113 | asset1.Data = asset.Data; |
114 | 114 | ||
115 | string id = m_scene.AssetService.Store(asset1); | 115 | string id = m_scene.AssetService.Store(asset1); |
116 | if (id == UUID.Zero.ToString()) | 116 | if (id == string.Empty) |
117 | { | 117 | { |
118 | m_log.DebugFormat("[HG ASSET MAPPER]: Asset server {0} did not accept {1}", url, asset.ID); | 118 | m_log.DebugFormat("[HG ASSET MAPPER]: Asset server {0} did not accept {1}", url, asset.ID); |
119 | success = false; | 119 | success = false; |
diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs index f1275a0..84dec8d 100644 --- a/OpenSim/Services/HypergridService/HGAssetService.cs +++ b/OpenSim/Services/HypergridService/HGAssetService.cs | |||
@@ -137,7 +137,7 @@ namespace OpenSim.Services.HypergridService | |||
137 | public override string Store(AssetBase asset) | 137 | public override string Store(AssetBase asset) |
138 | { | 138 | { |
139 | if (!m_AssetPerms.AllowedImport(asset.Type)) | 139 | if (!m_AssetPerms.AllowedImport(asset.Type)) |
140 | return UUID.Zero.ToString(); | 140 | return string.Empty; |
141 | 141 | ||
142 | return base.Store(asset); | 142 | return base.Store(asset); |
143 | } | 143 | } |