diff options
author | Dr Scofield | 2008-06-27 20:40:25 +0000 |
---|---|---|
committer | Dr Scofield | 2008-06-27 20:40:25 +0000 |
commit | 20940951b2360782214add0e3674f0fdc7060990 (patch) | |
tree | fc320931fd0ba8f4f2d8efbc92271f2f858f5957 /OpenSim/Region/Environment/Modules/Agent | |
parent | * Experiment with not bothering with a seperate assets metadata file - extrac... (diff) | |
download | opensim-SC-20940951b2360782214add0e3674f0fdc7060990.zip opensim-SC-20940951b2360782214add0e3674f0fdc7060990.tar.gz opensim-SC-20940951b2360782214add0e3674f0fdc7060990.tar.bz2 opensim-SC-20940951b2360782214add0e3674f0fdc7060990.tar.xz |
more warnings to go.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Agent')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs | 18 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs | 14 |
2 files changed, 22 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs index 7c187c0..c5af174 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs | |||
@@ -40,19 +40,19 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
40 | //private static readonly log4net.ILog m_log | 40 | //private static readonly log4net.ILog m_log |
41 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 41 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
42 | 42 | ||
43 | private bool m_cancel = false; | 43 | // private bool m_cancel = false; |
44 | private IClientAPI m_client; | 44 | // private IClientAPI m_client; |
45 | 45 | ||
46 | // See ITextureSender | 46 | // See ITextureSender |
47 | 47 | ||
48 | private bool m_sending = false; | 48 | // private bool m_sending = false; |
49 | private LLUUID m_textureId; | 49 | private LLUUID m_textureId; |
50 | 50 | ||
51 | // See ITextureSender | 51 | // See ITextureSender |
52 | 52 | ||
53 | public TextureNotFoundSender(IClientAPI client, LLUUID textureID) | 53 | public TextureNotFoundSender(IClientAPI client, LLUUID textureID) |
54 | { | 54 | { |
55 | m_client = client; | 55 | // // m_client = client; |
56 | m_textureId = textureID; | 56 | m_textureId = textureID; |
57 | } | 57 | } |
58 | 58 | ||
@@ -61,13 +61,19 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
61 | public bool Sending | 61 | public bool Sending |
62 | { | 62 | { |
63 | get { return false; } | 63 | get { return false; } |
64 | set { m_sending = value; } | 64 | set |
65 | { | ||
66 | // m_sending = value; | ||
67 | } | ||
65 | } | 68 | } |
66 | 69 | ||
67 | public bool Cancel | 70 | public bool Cancel |
68 | { | 71 | { |
69 | get { return false; } | 72 | get { return false; } |
70 | set { m_cancel = value; } | 73 | set |
74 | { | ||
75 | // m_cancel = value; | ||
76 | } | ||
71 | } | 77 | } |
72 | 78 | ||
73 | // See ITextureSender | 79 | // See ITextureSender |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs index be73156..7554d1a 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs | |||
@@ -57,11 +57,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender | |||
57 | 57 | ||
58 | //public LLUUID assetID { get { return m_asset.FullID; } } | 58 | //public LLUUID assetID { get { return m_asset.FullID; } } |
59 | 59 | ||
60 | private bool m_cancel = false; | 60 | // private bool m_cancel = false; |
61 | 61 | ||
62 | // See ITextureSender | 62 | // See ITextureSender |
63 | 63 | ||
64 | private bool m_sending = false; | 64 | // private bool m_sending = false; |
65 | 65 | ||
66 | /// <summary> | 66 | /// <summary> |
67 | /// 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 |
@@ -91,13 +91,19 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender | |||
91 | public bool Cancel | 91 | public bool Cancel |
92 | { | 92 | { |
93 | get { return false; } | 93 | get { return false; } |
94 | set { m_cancel = value; } | 94 | set |
95 | { | ||
96 | // m_cancel = value; | ||
97 | } | ||
95 | } | 98 | } |
96 | 99 | ||
97 | public bool Sending | 100 | public bool Sending |
98 | { | 101 | { |
99 | get { return false; } | 102 | get { return false; } |
100 | set { m_sending = value; } | 103 | set |
104 | { | ||
105 | // m_sending = value; | ||
106 | } | ||
101 | } | 107 | } |
102 | 108 | ||
103 | // See ITextureSender | 109 | // See ITextureSender |