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

From: Alan Webb <alan_webb@us.ibm.com>

Browse Source 
Changes to AssetCache and DynamicTextureModule to eliminate
  opportunities for lost texture updates.
This commit is contained in:
Dr Scofield
2009-03-24 08:21:50 +00:00
parent ec07baa8c0
commit b5f6aa6ff2
2 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -350,7 +350,7 @@ namespace OpenSim.Framework.Communications.Cache
// If it's a direct request for a script, drop it
// because it's a hacked client
if (req.AssetRequestSource != 2 || assetInf.Type != 10)
AssetRequests.Add(req);
lock(AssetRequests) AssetRequests.Add(req);
}
}
@@ -487,7 +487,7 @@ namespace OpenSim.Framework.Communications.Cache
req.Params = transferRequest.TransferInfo.Params;
req.AssetInf = new AssetInfo(asset);
req.NumPackets = CalculateNumPackets(asset.Data);
AssetRequests.Add(req);
lock(AssetRequests) AssetRequests.Add(req);
}
/// <summary>
@@ -506,16 +506,16 @@ namespace OpenSim.Framework.Communications.Cache
int num = Math.Min(5, AssetRequests.Count);
AssetRequest req;
AssetRequestToClient req2 = null;
AssetRequestToClient req2 = new AssetRequestToClient();
for (int i = 0; i < num; i++)
{
req = AssetRequests[i];
if (req2 == null)
lock(AssetRequests)
{
req2 = new AssetRequestToClient();
req = AssetRequests[0];
AssetRequests.RemoveAt(0);
}
// Trying to limit memory usage by only creating AssetRequestToClient if needed
req2.AssetInf = req.AssetInf;
req2.AssetRequestSource = req.AssetRequestSource;
req2.DataPointer = req.DataPointer;
@@ -528,13 +528,9 @@ namespace OpenSim.Framework.Communications.Cache
req2.RequestAssetID = req.RequestAssetID;
req2.TransferRequestID = req.TransferRequestID;
req.RequestUser.SendAsset(req2);
}
//remove requests that have been completed
for (int i = 0; i < num; i++)
{
AssetRequests.RemoveAt(0);
}
}
public class AssetRequest