ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleaning up, fixing warnings

Browse Source
This commit is contained in:
Dr Scofield
2009-04-22 09:42:44 +00:00
parent 2ebedc5c29
commit 458f7eb9b3
9 changed files with 67 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@@ -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

12
OpenSim/Framework/Servers/GetAssetStreamHandler.cs
View File

@@ -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)
{

9
OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
View File

@@ -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;
}