diff options
author | Justin Clark-Casey (justincc) | 2012-01-02 21:31:42 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-01-02 21:31:42 +0000 |
commit | fac8c258515c533854549109f14615b8be3ddc15 (patch) | |
tree | d5657b8b6b1c6074566574bd3a961378cc51f056 /OpenSim/Region/ClientStack/Linden/UDP | |
parent | Adding commented out log messages and some minor formatting for future bug hu... (diff) | |
download | opensim-SC_OLD-fac8c258515c533854549109f14615b8be3ddc15.zip opensim-SC_OLD-fac8c258515c533854549109f14615b8be3ddc15.tar.gz opensim-SC_OLD-fac8c258515c533854549109f14615b8be3ddc15.tar.bz2 opensim-SC_OLD-fac8c258515c533854549109f14615b8be3ddc15.tar.xz |
Reduce accessibility of some J2KImage/LLImageManager properties and methods to reduce potential code complexity and make code reading easier.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs index 1dea87e..cb9692a 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | |||
@@ -56,9 +56,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
56 | public IAssetService AssetService; | 56 | public IAssetService AssetService; |
57 | public UUID AgentID; | 57 | public UUID AgentID; |
58 | public IInventoryAccessModule InventoryAccessModule; | 58 | public IInventoryAccessModule InventoryAccessModule; |
59 | public OpenJPEG.J2KLayerInfo[] Layers; | 59 | private OpenJPEG.J2KLayerInfo[] m_layers; |
60 | public bool IsDecoded; | 60 | public bool IsDecoded { get; private set; } |
61 | public bool HasAsset; | 61 | public bool HasAsset { get; private set; } |
62 | public C5.IPriorityQueueHandle<J2KImage> PriorityQueueHandle; | 62 | public C5.IPriorityQueueHandle<J2KImage> PriorityQueueHandle; |
63 | 63 | ||
64 | private uint m_currentPacket; | 64 | private uint m_currentPacket; |
@@ -170,14 +170,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
170 | if (DiscardLevel >= 0 || m_stopPacket == 0) | 170 | if (DiscardLevel >= 0 || m_stopPacket == 0) |
171 | { | 171 | { |
172 | // This shouldn't happen, but if it does, we really can't proceed | 172 | // This shouldn't happen, but if it does, we really can't proceed |
173 | if (Layers == null) | 173 | if (m_layers == null) |
174 | { | 174 | { |
175 | m_log.Warn("[J2KIMAGE]: RunUpdate() called with missing Layers. Canceling texture transfer"); | 175 | m_log.Warn("[J2KIMAGE]: RunUpdate() called with missing Layers. Canceling texture transfer"); |
176 | m_currentPacket = m_stopPacket; | 176 | m_currentPacket = m_stopPacket; |
177 | return; | 177 | return; |
178 | } | 178 | } |
179 | 179 | ||
180 | int maxDiscardLevel = Math.Max(0, Layers.Length - 1); | 180 | int maxDiscardLevel = Math.Max(0, m_layers.Length - 1); |
181 | 181 | ||
182 | // Treat initial texture downloads with a DiscardLevel of -1 a request for the highest DiscardLevel | 182 | // Treat initial texture downloads with a DiscardLevel of -1 a request for the highest DiscardLevel |
183 | if (DiscardLevel < 0 && m_stopPacket == 0) | 183 | if (DiscardLevel < 0 && m_stopPacket == 0) |
@@ -187,9 +187,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
187 | DiscardLevel = (sbyte)Math.Min(DiscardLevel, maxDiscardLevel); | 187 | DiscardLevel = (sbyte)Math.Min(DiscardLevel, maxDiscardLevel); |
188 | 188 | ||
189 | //Calculate the m_stopPacket | 189 | //Calculate the m_stopPacket |
190 | if (Layers.Length > 0) | 190 | if (m_layers.Length > 0) |
191 | { | 191 | { |
192 | m_stopPacket = (uint)GetPacketForBytePosition(Layers[(Layers.Length - 1) - DiscardLevel].End); | 192 | m_stopPacket = (uint)GetPacketForBytePosition(m_layers[(m_layers.Length - 1) - DiscardLevel].End); |
193 | //I don't know why, but the viewer seems to expect the final packet if the file | 193 | //I don't know why, but the viewer seems to expect the final packet if the file |
194 | //is just one packet bigger. | 194 | //is just one packet bigger. |
195 | if (TexturePacketCount() == m_stopPacket + 1) | 195 | if (TexturePacketCount() == m_stopPacket + 1) |
@@ -341,7 +341,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
341 | 341 | ||
342 | private void J2KDecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers) | 342 | private void J2KDecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers) |
343 | { | 343 | { |
344 | Layers = layers; | 344 | m_layers = layers; |
345 | IsDecoded = true; | 345 | IsDecoded = true; |
346 | RunUpdate(); | 346 | RunUpdate(); |
347 | } | 347 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs index 5c4a662..e3a881f 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs | |||
@@ -211,7 +211,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
211 | 211 | ||
212 | #region Priority Queue Helpers | 212 | #region Priority Queue Helpers |
213 | 213 | ||
214 | J2KImage GetHighestPriorityImage() | 214 | private J2KImage GetHighestPriorityImage() |
215 | { | 215 | { |
216 | J2KImage image = null; | 216 | J2KImage image = null; |
217 | 217 | ||
@@ -226,7 +226,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
226 | return image; | 226 | return image; |
227 | } | 227 | } |
228 | 228 | ||
229 | void AddImageToQueue(J2KImage image) | 229 | private void AddImageToQueue(J2KImage image) |
230 | { | 230 | { |
231 | image.PriorityQueueHandle = null; | 231 | image.PriorityQueueHandle = null; |
232 | 232 | ||
@@ -237,7 +237,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
237 | } | 237 | } |
238 | } | 238 | } |
239 | 239 | ||
240 | void RemoveImageFromQueue(J2KImage image) | 240 | private void RemoveImageFromQueue(J2KImage image) |
241 | { | 241 | { |
242 | lock (m_syncRoot) | 242 | lock (m_syncRoot) |
243 | { | 243 | { |
@@ -246,7 +246,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
246 | } | 246 | } |
247 | } | 247 | } |
248 | 248 | ||
249 | void UpdateImageInQueue(J2KImage image) | 249 | private void UpdateImageInQueue(J2KImage image) |
250 | { | 250 | { |
251 | lock (m_syncRoot) | 251 | lock (m_syncRoot) |
252 | { | 252 | { |