Permalink
Browse files

merge -r 3312:3314 LIBOMV-823 LIBOMV-828

git-svn-id: file:///data/svn/omf/libopenmetaverse/branches/0.8-devel@3315 454cea33-f7e8-409b-8d0d-70907e6fec76
  • Loading branch information...
latifer
latifer committed May 5, 2010
1 parent f7dbfe9 commit 320d51e18174f2add845752a803ed622458cb48c
Showing with 9 additions and 1 deletion.
  1. +7 −1 OpenMetaverse/AssetManager.cs
  2. +2 −0 OpenMetaverse/Simulator.cs
@@ -768,8 +768,10 @@ public UUID RequestUpload(out UUID assetID, AssetType type, byte[] data, bool st
request.AssetBlock.TransactionID = transactionID;
request.AssetBlock.Type = (sbyte)type;
+ bool isMultiPacketUpload;
if (data.Length + 100 < Settings.MAX_PACKET_SIZE)
{
+ isMultiPacketUpload = false;
Logger.Log(
String.Format("Beginning asset upload [Single Packet], ID: {0}, AssetID: {1}, Size: {2}",
upload.ID.ToString(), upload.AssetID.ToString(), upload.Size), Helpers.LogLevel.Info, Client);
@@ -782,6 +784,7 @@ public UUID RequestUpload(out UUID assetID, AssetType type, byte[] data, bool st
}
else
{
+ isMultiPacketUpload = true;
Logger.Log(
String.Format("Beginning asset upload [Multiple Packets], ID: {0}, AssetID: {1}, Size: {2}",
upload.ID.ToString(), upload.AssetID.ToString(), upload.Size), Helpers.LogLevel.Info, Client);
@@ -804,7 +807,10 @@ public UUID RequestUpload(out UUID assetID, AssetType type, byte[] data, bool st
if (t < UPLOAD_CONFIRM_TIMEOUT)
{
- WaitingForUploadConfirm = true;
+ if (isMultiPacketUpload)
+ {
+ WaitingForUploadConfirm = true;
+ }
PendingUpload = upload;
Client.Network.SendPacket(request);
@@ -122,6 +122,8 @@ public enum SimAccess : byte
PG = 13,
/// <summary>Mature rating</summary>
Mature = 21,
+ /// <summary>Adult rating</summary>
+ Adult = 42,
/// <summary>Simulator is offline</summary>
Down = 254,
/// <summary>Simulator does not exist</summary>

0 comments on commit 320d51e

Please sign in to comment.