diff options
* optimized usings.
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/TextureSender')
3 files changed, 4 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs index df672b8..3a1d9a3 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -26,11 +26,10 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
29 | using System.IO; | 30 | using System.IO; |
30 | using System.Reflection; | 31 | using System.Reflection; |
31 | using System.Text; | 32 | using System.Text; |
32 | using System.Threading; | ||
33 | using System.Collections.Generic; | ||
34 | using log4net; | 33 | using log4net; |
35 | using Nini.Config; | 34 | using Nini.Config; |
36 | using OpenMetaverse; | 35 | using OpenMetaverse; |
@@ -166,7 +165,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
166 | private void doJ2kDecode(UUID AssetId, byte[] j2kdata) | 165 | private void doJ2kDecode(UUID AssetId, byte[] j2kdata) |
167 | { | 166 | { |
168 | int DecodeTime = 0; | 167 | int DecodeTime = 0; |
169 | DecodeTime = System.Environment.TickCount; | 168 | DecodeTime = Environment.TickCount; |
170 | OpenJPEG.J2KLayerInfo[] layers = new OpenJPEG.J2KLayerInfo[0]; // Dummy result for if it fails. Informs that there's only full quality | 169 | OpenJPEG.J2KLayerInfo[] layers = new OpenJPEG.J2KLayerInfo[0]; // Dummy result for if it fails. Informs that there's only full quality |
171 | 170 | ||
172 | if (!OpenJpegFail) | 171 | if (!OpenJpegFail) |
@@ -198,7 +197,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
198 | 197 | ||
199 | 198 | ||
200 | // Write out decode time | 199 | // Write out decode time |
201 | m_log.InfoFormat("[J2KDecoderModule]: {0} Decode Time: {1}", System.Environment.TickCount - DecodeTime, | 200 | m_log.InfoFormat("[J2KDecoderModule]: {0} Decode Time: {1}", Environment.TickCount - DecodeTime, |
202 | AssetId); | 201 | AssetId); |
203 | 202 | ||
204 | } | 203 | } |
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs index df553ac..ec95187 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs | |||
@@ -26,12 +26,10 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | ||
30 | using NUnit.Framework; | 29 | using NUnit.Framework; |
31 | using NUnit.Framework.SyntaxHelpers; | 30 | using NUnit.Framework.SyntaxHelpers; |
32 | using OpenMetaverse; | 31 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
34 | using OpenSim.Region.CoreModules.Agent.TextureSender; | ||
35 | using OpenSim.Tests.Common.Mock; | 33 | using OpenSim.Tests.Common.Mock; |
36 | 34 | ||
37 | namespace OpenSim.Region.CoreModules.Agent.TextureSender | 35 | namespace OpenSim.Region.CoreModules.Agent.TextureSender |
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs index b3ac624..dde8566 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs | |||
@@ -27,7 +27,6 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using OpenMetaverse.Packets; | ||
31 | using log4net; | 30 | using log4net; |
32 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
33 | using OpenSim.Region.Framework.Interfaces; | 32 | using OpenSim.Region.Framework.Interfaces; |