diff options
author | Adam Frisby | 2008-05-01 18:04:42 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 18:04:42 +0000 |
commit | 20a9bf08f51351e1e0a9de94f184ff56cd572665 (patch) | |
tree | 52da64dab26353b903c8e4befed0178fa72a188b /OpenSim/Region/Environment/Modules/Agent/TextureSender | |
parent | More config cleanup in LaunchSLClient. (diff) | |
download | opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.zip opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.gz opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.bz2 opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.xz |
* Rolled back a few changes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs index 44b9a23..02c541b 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs | |||
@@ -43,14 +43,12 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender | |||
43 | private static readonly ILog m_log | 43 | private static readonly ILog m_log |
44 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | private readonly IClientAPI RequestUser; | ||
47 | |||
48 | /// <summary> | 46 | /// <summary> |
49 | /// Records the number of times texture send has been called. | 47 | /// Records the number of times texture send has been called. |
50 | /// </summary> | 48 | /// </summary> |
51 | public int counter; | 49 | public int counter = 0; |
52 | 50 | ||
53 | public bool ImageLoaded; | 51 | public bool ImageLoaded = false; |
54 | 52 | ||
55 | /// <summary> | 53 | /// <summary> |
56 | /// Holds the texture asset to send. | 54 | /// Holds the texture asset to send. |
@@ -59,26 +57,27 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender | |||
59 | 57 | ||
60 | //public LLUUID assetID { get { return m_asset.FullID; } } | 58 | //public LLUUID assetID { get { return m_asset.FullID; } } |
61 | 59 | ||
62 | private bool m_cancel; | 60 | private bool m_cancel = false; |
63 | 61 | ||
64 | // See ITextureSender | 62 | // See ITextureSender |
65 | 63 | ||
66 | private bool m_sending; | 64 | private bool m_sending = false; |
67 | 65 | ||
68 | /// <summary> | 66 | /// <summary> |
69 | /// This is actually the number of extra packets required to send the texture data! We always assume | 67 | /// This is actually the number of extra packets required to send the texture data! We always assume |
70 | /// at least one is required. | 68 | /// at least one is required. |
71 | /// </summary> | 69 | /// </summary> |
72 | private int NumPackets; | 70 | private int NumPackets = 0; |
73 | 71 | ||
74 | /// <summary> | 72 | /// <summary> |
75 | /// Holds the packet number to send next. In this case, each packet is 1000 bytes long and starts | 73 | /// Holds the packet number to send next. In this case, each packet is 1000 bytes long and starts |
76 | /// at the 600th byte (0th indexed). | 74 | /// at the 600th byte (0th indexed). |
77 | /// </summary> | 75 | /// </summary> |
78 | private int PacketCounter; | 76 | private int PacketCounter = 0; |
79 | 77 | ||
80 | private int RequestedDiscardLevel = -1; | 78 | private int RequestedDiscardLevel = -1; |
81 | private uint StartPacketNumber; | 79 | private IClientAPI RequestUser; |
80 | private uint StartPacketNumber = 0; | ||
82 | 81 | ||
83 | public TextureSender(IClientAPI client, int discardLevel, uint packetNumber) | 82 | public TextureSender(IClientAPI client, int discardLevel, uint packetNumber) |
84 | { | 83 | { |
@@ -191,7 +190,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender | |||
191 | catch (ArgumentOutOfRangeException) | 190 | catch (ArgumentOutOfRangeException) |
192 | { | 191 | { |
193 | m_log.Error("[TEXTURE SENDER]: Unable to separate texture into multiple packets: Array bounds failure on asset:" + | 192 | m_log.Error("[TEXTURE SENDER]: Unable to separate texture into multiple packets: Array bounds failure on asset:" + |
194 | m_asset.FullID); | 193 | m_asset.FullID.ToString()); |
195 | return; | 194 | return; |
196 | } | 195 | } |
197 | RequestUser.OutPacket(im, ThrottleOutPacketType.Texture); | 196 | RequestUser.OutPacket(im, ThrottleOutPacketType.Texture); |