diff options
author | Mike Mazur | 2009-02-17 01:36:44 +0000 |
---|---|---|
committer | Mike Mazur | 2009-02-17 01:36:44 +0000 |
commit | 76c0935ec744f2d230489398f879eb7f42b11d37 (patch) | |
tree | a68253554e3899f10b6c341db369ce4a029dfaa5 /OpenSim/Region/CoreModules/Agent/TextureSender | |
parent | Major change to how appearance is managed, including changes in login and use... (diff) | |
download | opensim-SC_OLD-76c0935ec744f2d230489398f879eb7f42b11d37.zip opensim-SC_OLD-76c0935ec744f2d230489398f879eb7f42b11d37.tar.gz opensim-SC_OLD-76c0935ec744f2d230489398f879eb7f42b11d37.tar.bz2 opensim-SC_OLD-76c0935ec744f2d230489398f879eb7f42b11d37.tar.xz |
- remove the Metadata property from AssetBase and return all previous
properties as before
- prefix private variables with m_ in AssetBase.cs
- related to Mantis #3122, as mentioned in
https://lists.berlios.de/pipermail/opensim-dev/2009-February/005088.html
- all services will likely need to be upgraded after this commit
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/TextureSender')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs index dde8566..e02ea6d 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs | |||
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
54 | /// </summary> | 54 | /// </summary> |
55 | private AssetBase m_asset; | 55 | private AssetBase m_asset; |
56 | 56 | ||
57 | //public UUID assetID { get { return m_asset.Metadata.FullID; } } | 57 | //public UUID assetID { get { return m_asset.FullID; } } |
58 | 58 | ||
59 | // private bool m_cancel = false; | 59 | // private bool m_cancel = false; |
60 | 60 | ||
@@ -116,7 +116,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
116 | // See ITextureSender | 116 | // See ITextureSender |
117 | public bool SendTexturePacket() | 117 | public bool SendTexturePacket() |
118 | { | 118 | { |
119 | //m_log.DebugFormat("[TEXTURE SENDER]: Sending packet for {0}", m_asset.Metadata.FullID); | 119 | //m_log.DebugFormat("[TEXTURE SENDER]: Sending packet for {0}", m_asset.FullID); |
120 | 120 | ||
121 | SendPacket(); | 121 | SendPacket(); |
122 | counter++; | 122 | counter++; |
@@ -153,7 +153,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
153 | { | 153 | { |
154 | if (NumPackets == 0) | 154 | if (NumPackets == 0) |
155 | { | 155 | { |
156 | RequestUser.SendImageFirstPart(1, m_asset.Metadata.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2); | 156 | RequestUser.SendImageFirstPart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2); |
157 | PacketCounter++; | 157 | PacketCounter++; |
158 | } | 158 | } |
159 | else | 159 | else |
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
162 | Array.Copy(m_asset.Data, 0, ImageData1, 0, 600); | 162 | Array.Copy(m_asset.Data, 0, ImageData1, 0, 600); |
163 | 163 | ||
164 | RequestUser.SendImageFirstPart( | 164 | RequestUser.SendImageFirstPart( |
165 | (ushort)(NumPackets), m_asset.Metadata.FullID, (uint)m_asset.Data.Length, ImageData1, 2); | 165 | (ushort)(NumPackets), m_asset.FullID, (uint)m_asset.Data.Length, ImageData1, 2); |
166 | PacketCounter++; | 166 | PacketCounter++; |
167 | } | 167 | } |
168 | } | 168 | } |
@@ -178,11 +178,11 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
178 | catch (ArgumentOutOfRangeException) | 178 | catch (ArgumentOutOfRangeException) |
179 | { | 179 | { |
180 | m_log.Error("[TEXTURE SENDER]: Unable to separate texture into multiple packets: Array bounds failure on asset:" + | 180 | m_log.Error("[TEXTURE SENDER]: Unable to separate texture into multiple packets: Array bounds failure on asset:" + |
181 | m_asset.Metadata.ID); | 181 | m_asset.ID); |
182 | return; | 182 | return; |
183 | } | 183 | } |
184 | 184 | ||
185 | RequestUser.SendImageNextPart((ushort)PacketCounter, m_asset.Metadata.FullID, imageData); | 185 | RequestUser.SendImageNextPart((ushort)PacketCounter, m_asset.FullID, imageData); |
186 | PacketCounter++; | 186 | PacketCounter++; |
187 | } | 187 | } |
188 | } | 188 | } |