diff options
author | Justin Clarke Casey | 2009-05-04 15:38:36 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-05-04 15:38:36 +0000 |
commit | 257fc5515ac9cb36032c2f44f040c3620ed2f328 (patch) | |
tree | 167d99d28167e6ab36a96bccf22fbef0b9f0cce1 /OpenSim/Region/ClientStack | |
parent | Prebuild changes to allow the console to reference the http server (diff) | |
download | opensim-SC-257fc5515ac9cb36032c2f44f040c3620ed2f328.zip opensim-SC-257fc5515ac9cb36032c2f44f040c3620ed2f328.tar.gz opensim-SC-257fc5515ac9cb36032c2f44f040c3620ed2f328.tar.bz2 opensim-SC-257fc5515ac9cb36032c2f44f040c3620ed2f328.tar.xz |
* minor: remove some mono compiler warnings, minor cleanup
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs index 6878fe5..1882005 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | |||
@@ -36,20 +36,13 @@ using System.Reflection; | |||
36 | 36 | ||
37 | namespace OpenSim.Region.ClientStack.LindenUDP | 37 | namespace OpenSim.Region.ClientStack.LindenUDP |
38 | { | 38 | { |
39 | /* | 39 | /// <summary> |
40 | * | 40 | /// We use this class to store image data and associated request data and attributes |
41 | * J2KImage | 41 | /// </summary> |
42 | * | ||
43 | * We use this class to store image data and associated request data and attributes | ||
44 | * | ||
45 | * | ||
46 | * | ||
47 | */ | ||
48 | |||
49 | public class J2KImage | 42 | public class J2KImage |
50 | { | 43 | { |
51 | |||
52 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | |||
53 | public double m_designatedPriorityKey; | 46 | public double m_designatedPriorityKey; |
54 | public double m_requestedPriority = 0.0d; | 47 | public double m_requestedPriority = 0.0d; |
55 | public uint m_lastSequence = 0; | 48 | public uint m_lastSequence = 0; |
@@ -107,7 +100,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
107 | { | 100 | { |
108 | return (ushort)(((m_asset.Data.Length - cFirstPacketSize + cImagePacketSize - 1) / cImagePacketSize) + 1); | 101 | return (ushort)(((m_asset.Data.Length - cFirstPacketSize + cImagePacketSize - 1) / cImagePacketSize) + 1); |
109 | } | 102 | } |
110 | catch(Exception e) | 103 | catch (Exception) |
111 | { | 104 | { |
112 | // If the asset is missing/destroyed/truncated, we will land | 105 | // If the asset is missing/destroyed/truncated, we will land |
113 | // here | 106 | // here |
@@ -223,9 +216,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
223 | } | 216 | } |
224 | } | 217 | } |
225 | 218 | ||
226 | //It's concievable that the client might request packet one | 219 | // It's concievable that the client might request packet one |
227 | //from a one packet image, which is really packet 0, | 220 | // from a one packet image, which is really packet 0, |
228 | //which would leave us with a negative imagePacketSize.. | 221 | // which would leave us with a negative imagePacketSize.. |
229 | if (imagePacketSize > 0) | 222 | if (imagePacketSize > 0) |
230 | { | 223 | { |
231 | byte[] imageData = new byte[imagePacketSize]; | 224 | byte[] imageData = new byte[imagePacketSize]; |
@@ -252,7 +245,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
252 | return true; | 245 | return true; |
253 | } | 246 | } |
254 | } | 247 | } |
255 | catch (Exception e) | 248 | catch (Exception) |
256 | { | 249 | { |
257 | return false; | 250 | return false; |
258 | } | 251 | } |