diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/GetAssetStreamHandler.cs | 12 | ||||
-rw-r--r-- | OpenSim/Framework/Statistics/SimExtraStatsCollector.cs | 9 |
3 files changed, 14 insertions, 15 deletions
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 | |||
391 | 391 | ||
392 | protected void ProcessReceivedAsset(bool IsTexture, AssetInfo assetInf, IUserService userService) | 392 | protected void ProcessReceivedAsset(bool IsTexture, AssetInfo assetInf, IUserService userService) |
393 | { | 393 | { |
394 | if (!IsTexture && assetInf.ContainsReferences && false) | 394 | // if (!IsTexture && assetInf.ContainsReferences && false) |
395 | { | 395 | // { |
396 | assetInf.Data = ProcessAssetData(assetInf.Data, userService); | 396 | // assetInf.Data = ProcessAssetData(assetInf.Data, userService); |
397 | } | 397 | // } |
398 | } | 398 | } |
399 | 399 | ||
400 | // See IAssetReceiver | 400 | // 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 | |||
126 | return result; | 126 | return result; |
127 | } | 127 | } |
128 | 128 | ||
129 | private byte[] ProcessOutgoingAssetData(byte[] assetData) | 129 | // private byte[] ProcessOutgoingAssetData(byte[] assetData) |
130 | { | 130 | // { |
131 | string data = Encoding.ASCII.GetString(assetData); | 131 | // string data = Encoding.ASCII.GetString(assetData); |
132 | 132 | ||
133 | data = ProcessAssetDataString(data); | 133 | // data = ProcessAssetDataString(data); |
134 | 134 | ||
135 | return Encoding.ASCII.GetBytes(data); | 135 | // return Encoding.ASCII.GetBytes(data); |
136 | } | 136 | // } |
137 | 137 | ||
138 | public string ProcessAssetDataString(string data) | 138 | public string ProcessAssetDataString(string data) |
139 | { | 139 | { |
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 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | using OpenMetaverse; | ||
32 | using OpenSim.Framework.Statistics.Interfaces; | ||
33 | 31 | ||
34 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Framework.Statistics.Interfaces; | ||
35 | using OpenMetaverse.StructuredData; | 34 | using OpenMetaverse.StructuredData; |
36 | 35 | ||
37 | namespace OpenSim.Framework.Statistics | 36 | namespace OpenSim.Framework.Statistics |
@@ -421,11 +420,11 @@ Asset service request failures: {3}" + Environment.NewLine, | |||
421 | args["Memory"] = OSD.FromString(base.XReport()); | 420 | args["Memory"] = OSD.FromString(base.XReport()); |
422 | 421 | ||
423 | string strBuffer = ""; | 422 | string strBuffer = ""; |
424 | byte[] buffer = new byte[1]; | 423 | // byte[] buffer = new byte[1]; |
425 | 424 | ||
426 | strBuffer = OSDParser.SerializeJsonString(args); | 425 | strBuffer = OSDParser.SerializeJsonString(args); |
427 | UTF8Encoding str = new UTF8Encoding(); | 426 | // UTF8Encoding str = new UTF8Encoding(); |
428 | buffer = str.GetBytes(strBuffer); | 427 | // buffer = str.GetBytes(strBuffer); |
429 | 428 | ||
430 | return strBuffer; | 429 | return strBuffer; |
431 | } | 430 | } |