Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* OnImageReceiveProgress now returns the packet number it just received

Browse Source 
* Texture re-request timer will now reduce the DiscardLevel by one each re-request. This is temporary while we re-think the callback system for texture downloads
* TestClient downloadtexture now takes an optional DiscardLevel
* Added int support to Utils.Clamp()

git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@2246 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2008-09-29 13:58:08 +00:00
parent a23f41fdca
commit 2582304f4e
4 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Programs/examples/TestClient/Commands/Prims/DownloadTextureCommand.cs
View File

@@ -25,8 +25,8 @@ namespace OpenMetaverse.TestClient
public override string Execute(string[] args, UUID fromAgentID)
{
if (args.Length != 1)
return "Usage: downloadtexture [texture-uuid]";
if (args.Length != 1 && args.Length != 2)
return "Usage: downloadtexture [texture-uuid] [discardlevel]";
TextureID = UUID.Zero;
DownloadHandle.Reset();
@@ -35,7 +35,16 @@ namespace OpenMetaverse.TestClient
if (UUID.TryParse(args[0], out TextureID))
{
Client.Assets.RequestImage(TextureID, ImageType.Normal);
int discardLevel = 0;
if (args.Length > 1)
{
if (!Int32.TryParse(args[1], out discardLevel))
return "Usage: downloadtexture [texture-uuid] [discardlevel]";
}
Client.Assets.RequestImage(TextureID, ImageType.Normal, 1000000.0f, discardLevel, 0);
if (DownloadHandle.WaitOne(120 * 1000, false))
{
if (Image != null && Image.Success)
@@ -80,10 +89,10 @@ namespace OpenMetaverse.TestClient
DownloadHandle.Set();
}
private void Assets_OnImageReceiveProgress(UUID image, int recieved, int total)
private void Assets_OnImageReceiveProgress(UUID image, int lastPacket, int recieved, int total)
{
if (image == TextureID)
Console.WriteLine(String.Format("Texture {0}: Received {1} / {2}", image, recieved, total));
Console.WriteLine(String.Format("Texture {0}: Received {1} / {2} (Packet: {3})", image, recieved, total, lastPacket));
}
}
}