ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Spring cleaned a bunch of '//TODO: unused' marked functions.

Browse Source
This commit is contained in:
Adam Frisby
2008-04-30 23:11:07 +00:00
parent b67cf72bc3
commit 25a49ac4de
12 changed files with 0 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs
View File

@@ -178,120 +178,6 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload
}
}
// TODO: unused
// private void RunAssetQueue()
// {
// while (true)
// {
// try
// {
// ProcessAssetQueue();
// Thread.Sleep(500);
// }
// catch (Exception)
// {
// // m_log.Error("[ASSET CACHE]: " + e.ToString());
// }
// }
// }
// TODO: unused
// /// <summary>
// /// Process the asset queue which sends packets directly back to the client.
// /// </summary>
// private void ProcessAssetQueue()
// {
// //should move the asset downloading to a module, like has been done with texture downloading
// if (AssetRequests.Count == 0)
// {
// //no requests waiting
// return;
// }
// // if less than 5, do all of them
// int num = Math.Min(5, AssetRequests.Count);
// AssetRequest req;
// for (int i = 0; i < num; i++)
// {
// req = (AssetRequest)AssetRequests[i];
// //Console.WriteLine("sending asset " + req.RequestAssetID);
// TransferInfoPacket Transfer = new TransferInfoPacket();
// Transfer.TransferInfo.ChannelType = 2;
// Transfer.TransferInfo.Status = 0;
// Transfer.TransferInfo.TargetType = 0;
// if (req.AssetRequestSource == 2)
// {
// Transfer.TransferInfo.Params = new byte[20];
// Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16);
// int assType = (int)req.AssetInf.Type;
// Array.Copy(Helpers.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4);
// }
// else if (req.AssetRequestSource == 3)
// {
// Transfer.TransferInfo.Params = req.Params;
// // Transfer.TransferInfo.Params = new byte[100];
// //Array.Copy(req.RequestUser.AgentId.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16);
// //Array.Copy(req.RequestUser.SessionId.GetBytes(), 0, Transfer.TransferInfo.Params, 16, 16);
// }
// Transfer.TransferInfo.Size = (int)req.AssetInf.Data.Length;
// Transfer.TransferInfo.TransferID = req.TransferRequestID;
// req.RequestUser.OutPacket(Transfer, ThrottleOutPacketType.Asset);
// if (req.NumPackets == 1)
// {
// TransferPacketPacket TransferPacket = new TransferPacketPacket();
// TransferPacket.TransferData.Packet = 0;
// TransferPacket.TransferData.ChannelType = 2;
// TransferPacket.TransferData.TransferID = req.TransferRequestID;
// TransferPacket.TransferData.Data = req.AssetInf.Data;
// TransferPacket.TransferData.Status = 1;
// req.RequestUser.OutPacket(TransferPacket, ThrottleOutPacketType.Asset);
// }
// else
// {
// int processedLength = 0;
// // libsecondlife hardcodes 1500 as the maximum data chunk size
// int maxChunkSize = 1250;
// int packetNumber = 0;
// while (processedLength < req.AssetInf.Data.Length)
// {
// TransferPacketPacket TransferPacket = new TransferPacketPacket();
// TransferPacket.TransferData.Packet = packetNumber;
// TransferPacket.TransferData.ChannelType = 2;
// TransferPacket.TransferData.TransferID = req.TransferRequestID;
// int chunkSize = Math.Min(req.AssetInf.Data.Length - processedLength, maxChunkSize);
// byte[] chunk = new byte[chunkSize];
// Array.Copy(req.AssetInf.Data, processedLength, chunk, 0, chunk.Length);
// TransferPacket.TransferData.Data = chunk;
// // 0 indicates more packets to come, 1 indicates last packet
// if (req.AssetInf.Data.Length - processedLength > maxChunkSize)
// {
// TransferPacket.TransferData.Status = 0;
// }
// else
// {
// TransferPacket.TransferData.Status = 1;
// }
// req.RequestUser.OutPacket(TransferPacket, ThrottleOutPacketType.Asset);
// processedLength += chunkSize;
// packetNumber++;
// }
// }
// }
// //remove requests that have been completed
// for (int i = 0; i < num; i++)
// {
// AssetRequests.RemoveAt(0);
// }
// }
/// <summary>
/// Calculate the number of packets required to send the asset to the client.
/// </summary>

6
OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs
View File

@@ -239,12 +239,6 @@ namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture
part.ScheduleFullUpdate();
}
// TODO: unused
// private byte[] BlendTextures(byte[] frontImage, byte[] backImage)
// {
// return BlendTextures(frontImage, backImage, false, 0);
// }
private byte[] BlendTextures(byte[] frontImage, byte[] backImage, bool setNewAlpha, byte newAlpha)
{
Bitmap image1 = new Bitmap(OpenJPEG.DecodeToImage(frontImage));

33
OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
View File

@@ -31,39 +31,6 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
{
public class FlattenSphere : ITerrainPaintableEffect
{
// TODO: unused
// private double GetBilinearInterpolate(double x, double y, ITerrainChannel map)
// {
// int w = map.Width;
// int h = map.Height;
// if (x > w - 2.0)
// x = w - 2.0;
// if (y > h - 2.0)
// y = h - 2.0;
// if (x < 0.0)
// x = 0.0;
// if (y < 0.0)
// y = 0.0;
// int stepSize = 1;
// double h00 = map[(int)x, (int)y];
// double h10 = map[(int)x + stepSize, (int)y];
// double h01 = map[(int)x, (int)y + stepSize];
// double h11 = map[(int)x + stepSize, (int)y + stepSize];
// double h1 = h00;
// double h2 = h10;
// double h3 = h01;
// double h4 = h11;
// double a00 = h1;
// double a10 = h2 - h1;
// double a01 = h3 - h1;
// double a11 = h1 - h2 - h3 + h4;
// double partialx = x - (int)x;
// double partialz = y - (int)y;
// double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);
// return hi;
// }
#region ITerrainPaintableEffect Members