aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent/TextureSender
diff options
context:
space:
mode:
authorlbsa712009-02-12 09:53:12 +0000
committerlbsa712009-02-12 09:53:12 +0000
commit801da4346aeb3c08969c4845f5c595135a64470a (patch)
tree2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/Region/CoreModules/Agent/TextureSender
parentThanks Kitto Flora for a patch that adds automatic min fly height to ODE - Ma... (diff)
downloadopensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.zip
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.gz
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.bz2
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.xz
* optimized usings.
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/TextureSender')
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs9
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs2
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs1
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
28using System; 28using System;
29using System.Collections.Generic;
29using System.IO; 30using System.IO;
30using System.Reflection; 31using System.Reflection;
31using System.Text; 32using System.Text;
32using System.Threading;
33using System.Collections.Generic;
34using log4net; 33using log4net;
35using Nini.Config; 34using Nini.Config;
36using OpenMetaverse; 35using 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
28using System; 28using System;
29using System.Collections;
30using NUnit.Framework; 29using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 30using NUnit.Framework.SyntaxHelpers;
32using OpenMetaverse; 31using OpenMetaverse;
33using OpenSim.Framework; 32using OpenSim.Framework;
34using OpenSim.Region.CoreModules.Agent.TextureSender;
35using OpenSim.Tests.Common.Mock; 33using OpenSim.Tests.Common.Mock;
36 34
37namespace OpenSim.Region.CoreModules.Agent.TextureSender 35namespace 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
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using OpenMetaverse.Packets;
31using log4net; 30using log4net;
32using OpenSim.Framework; 31using OpenSim.Framework;
33using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Interfaces;