aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorJeff Ames2008-02-29 10:51:40 +0000
committerJeff Ames2008-02-29 10:51:40 +0000
commit6d774339d9c51c1635e96cd92f57a8bc13021e5f (patch)
treeeb533537aebf610769b0bc64c947a021e9a491ae /OpenSim/Region/Environment/Modules
parentCleaned up a couple compiler warnings. (diff)
downloadopensim-SC_OLD-6d774339d9c51c1635e96cd92f57a8bc13021e5f.zip
opensim-SC_OLD-6d774339d9c51c1635e96cd92f57a8bc13021e5f.tar.gz
opensim-SC_OLD-6d774339d9c51c1635e96cd92f57a8bc13021e5f.tar.bz2
opensim-SC_OLD-6d774339d9c51c1635e96cd92f57a8bc13021e5f.tar.xz
More compiler warning cleanup.
Removed verbose flag, since it doesn't do anything any more.
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/AssetDownloadModule.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
index f53be41..33c0ce2 100644
--- a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
@@ -131,7 +131,6 @@ namespace OpenSim.Region.Environment.Modules
131 { 131 {
132 if (!userRequests.ContainsKey(requestID)) 132 if (!userRequests.ContainsKey(requestID))
133 { 133 {
134
135 AssetRequest request = new AssetRequest(); 134 AssetRequest request = new AssetRequest();
136 request.RequestUser = userInfo; 135 request.RequestUser = userInfo;
137 request.RequestAssetID = requestID; 136 request.RequestAssetID = requestID;
@@ -154,9 +153,7 @@ namespace OpenSim.Region.Environment.Modules
154 userRequests.Add(requestID, request); 153 userRequests.Add(requestID, request);
155 RequestedAssets[userInfo.AgentId] = userRequests; 154 RequestedAssets[userInfo.AgentId] = userRequests;
156 m_scene.AssetCache.GetAsset(requestID, AssetCallback, false); 155 m_scene.AssetCache.GetAsset(requestID, AssetCallback, false);
157
158 } 156 }
159 return;
160 } 157 }
161 158
162 public void AssetCallback(LLUUID assetID, AssetBase asset) 159 public void AssetCallback(LLUUID assetID, AssetBase asset)
@@ -190,7 +187,7 @@ namespace OpenSim.Region.Environment.Modules
190 ProcessAssetQueue(); 187 ProcessAssetQueue();
191 Thread.Sleep(500); 188 Thread.Sleep(500);
192 } 189 }
193 catch (Exception e) 190 catch (Exception)
194 { 191 {
195 // m_log.Error("[ASSET CACHE]: " + e.ToString()); 192 // m_log.Error("[ASSET CACHE]: " + e.ToString());
196 } 193 }
@@ -292,6 +289,7 @@ namespace OpenSim.Region.Environment.Modules
292 AssetRequests.RemoveAt(0); 289 AssetRequests.RemoveAt(0);
293 } 290 }
294 } 291 }
292
295 /// <summary> 293 /// <summary>
296 /// Calculate the number of packets required to send the asset to the client. 294 /// Calculate the number of packets required to send the asset to the client.
297 /// </summary> 295 /// </summary>
@@ -335,4 +333,4 @@ namespace OpenSim.Region.Environment.Modules
335 } 333 }
336 } 334 }
337 } 335 }
338} \ No newline at end of file 336}