diff options
author | MW | 2007-06-18 14:41:38 +0000 |
---|---|---|
committer | MW | 2007-06-18 14:41:38 +0000 |
commit | 82d309d00765944654db023416a104d96de04328 (patch) | |
tree | 51b0f366479231b0061be1dad9df7823cf3e7457 /OpenSim/OpenSim.Caches/AssetCache.cs | |
parent | Fixed inverted map texture problem. (diff) | |
download | opensim-SC_OLD-82d309d00765944654db023416a104d96de04328.zip opensim-SC_OLD-82d309d00765944654db023416a104d96de04328.tar.gz opensim-SC_OLD-82d309d00765944654db023416a104d96de04328.tar.bz2 opensim-SC_OLD-82d309d00765944654db023416a104d96de04328.tar.xz |
Fixed the flashing when crossing a border.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim.Caches/AssetCache.cs | 86 |
1 files changed, 42 insertions, 44 deletions
diff --git a/OpenSim/OpenSim.Caches/AssetCache.cs b/OpenSim/OpenSim.Caches/AssetCache.cs index 7622b30..eae0f80 100644 --- a/OpenSim/OpenSim.Caches/AssetCache.cs +++ b/OpenSim/OpenSim.Caches/AssetCache.cs | |||
@@ -556,63 +556,61 @@ namespace OpenSim.Caches | |||
556 | return server; | 556 | return server; |
557 | } | 557 | } |
558 | 558 | ||
559 | } | 559 | public class AssetRequest |
560 | |||
561 | public class AssetRequest | ||
562 | { | ||
563 | public IClientAPI RequestUser; | ||
564 | public LLUUID RequestAssetID; | ||
565 | public AssetInfo AssetInf; | ||
566 | public TextureImage ImageInfo; | ||
567 | public LLUUID TransferRequestID; | ||
568 | public long DataPointer = 0; | ||
569 | public int NumPackets = 0; | ||
570 | public int PacketCounter = 0; | ||
571 | public bool IsTextureRequest; | ||
572 | //public bool AssetInCache; | ||
573 | //public int TimeRequested; | ||
574 | |||
575 | public AssetRequest() | ||
576 | { | 560 | { |
561 | public IClientAPI RequestUser; | ||
562 | public LLUUID RequestAssetID; | ||
563 | public AssetInfo AssetInf; | ||
564 | public TextureImage ImageInfo; | ||
565 | public LLUUID TransferRequestID; | ||
566 | public long DataPointer = 0; | ||
567 | public int NumPackets = 0; | ||
568 | public int PacketCounter = 0; | ||
569 | public bool IsTextureRequest; | ||
570 | //public bool AssetInCache; | ||
571 | //public int TimeRequested; | ||
572 | |||
573 | public AssetRequest() | ||
574 | { | ||
577 | 575 | ||
576 | } | ||
578 | } | 577 | } |
579 | } | ||
580 | 578 | ||
581 | public class AssetInfo : AssetBase | 579 | public class AssetInfo : AssetBase |
582 | { | ||
583 | public AssetInfo() | ||
584 | { | 580 | { |
581 | public AssetInfo() | ||
582 | { | ||
585 | 583 | ||
586 | } | 584 | } |
587 | 585 | ||
588 | public AssetInfo(AssetBase aBase) | 586 | public AssetInfo(AssetBase aBase) |
589 | { | 587 | { |
590 | Data = aBase.Data; | 588 | Data = aBase.Data; |
591 | FullID = aBase.FullID; | 589 | FullID = aBase.FullID; |
592 | Type = aBase.Type; | 590 | Type = aBase.Type; |
593 | InvType = aBase.InvType; | 591 | InvType = aBase.InvType; |
594 | Name = aBase.Name; | 592 | Name = aBase.Name; |
595 | Description = aBase.Description; | 593 | Description = aBase.Description; |
594 | } | ||
596 | } | 595 | } |
597 | } | ||
598 | 596 | ||
599 | public class TextureImage : AssetBase | 597 | public class TextureImage : AssetBase |
600 | { | ||
601 | public TextureImage() | ||
602 | { | 598 | { |
599 | public TextureImage() | ||
600 | { | ||
603 | 601 | ||
604 | } | 602 | } |
605 | 603 | ||
606 | public TextureImage(AssetBase aBase) | 604 | public TextureImage(AssetBase aBase) |
607 | { | 605 | { |
608 | Data = aBase.Data; | 606 | Data = aBase.Data; |
609 | FullID = aBase.FullID; | 607 | FullID = aBase.FullID; |
610 | Type = aBase.Type; | 608 | Type = aBase.Type; |
611 | InvType = aBase.InvType; | 609 | InvType = aBase.InvType; |
612 | Name = aBase.Name; | 610 | Name = aBase.Name; |
613 | Description = aBase.Description; | 611 | Description = aBase.Description; |
612 | } | ||
614 | } | 613 | } |
615 | } | 614 | } |
616 | |||
617 | } | 615 | } |
618 | 616 | ||