From 458f7eb9b38609d02980afe5a6ee88d19c7dd7f8 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Wed, 22 Apr 2009 09:42:44 +0000
Subject: cleaning up, fixing warnings

---
 OpenSim/Framework/Communications/Cache/AssetCache.cs   |  8 ++++----
 OpenSim/Framework/Servers/GetAssetStreamHandler.cs     | 12 ++++++------
 OpenSim/Framework/Statistics/SimExtraStatsCollector.cs |  9 ++++-----
 3 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 8c451b0..ad8d625 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -391,10 +391,10 @@ namespace OpenSim.Framework.Communications.Cache
 
         protected void ProcessReceivedAsset(bool IsTexture, AssetInfo assetInf, IUserService userService)
         {            
-            if (!IsTexture && assetInf.ContainsReferences && false)
-            {
-                assetInf.Data = ProcessAssetData(assetInf.Data, userService);
-            }
+            // if (!IsTexture && assetInf.ContainsReferences && false)
+            // {
+            //     assetInf.Data = ProcessAssetData(assetInf.Data, userService);
+            // }
         }
 
         // See IAssetReceiver
diff --git a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
index 33b9e6e..628ee4e 100644
--- a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
+++ b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
@@ -126,14 +126,14 @@ namespace OpenSim.Framework.Servers
             return result;
         }
 
-        private byte[] ProcessOutgoingAssetData(byte[] assetData)
-        {
-            string data = Encoding.ASCII.GetString(assetData);
+        // private byte[] ProcessOutgoingAssetData(byte[] assetData)
+        // {
+        //     string data = Encoding.ASCII.GetString(assetData);
 
-            data = ProcessAssetDataString(data);
+        //     data = ProcessAssetDataString(data);
 
-            return Encoding.ASCII.GetBytes(data);
-        }
+        //     return Encoding.ASCII.GetBytes(data);
+        // }
 
         public string ProcessAssetDataString(string data)
         {
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index d3513fc..bab2764 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -28,10 +28,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenMetaverse;
-using OpenSim.Framework.Statistics.Interfaces;
 
 using OpenMetaverse;
+using OpenSim.Framework.Statistics.Interfaces;
 using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Framework.Statistics
@@ -421,11 +420,11 @@ Asset service request failures: {3}" + Environment.NewLine,
             args["Memory"] = OSD.FromString(base.XReport());
             
             string strBuffer = "";
-            byte[] buffer = new byte[1];
+            // byte[] buffer = new byte[1];
             
             strBuffer = OSDParser.SerializeJsonString(args);
-            UTF8Encoding str = new UTF8Encoding();
-            buffer = str.GetBytes(strBuffer);
+            // UTF8Encoding str = new UTF8Encoding();
+            // buffer = str.GetBytes(strBuffer);
 
             return strBuffer;
         }
-- 
cgit v1.1