diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs index f79f62e..697bbe6 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs | |||
@@ -198,13 +198,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
198 | private void Initialise(UUID fileID, string fileName) | 198 | private void Initialise(UUID fileID, string fileName) |
199 | { | 199 | { |
200 | m_asset = new AssetBase(); | 200 | m_asset = new AssetBase(); |
201 | m_asset.Metadata.FullID = fileID; | 201 | m_asset.FullID = fileID; |
202 | m_asset.Metadata.Type = type; | 202 | m_asset.Type = type; |
203 | m_asset.Data = new byte[0]; | 203 | m_asset.Data = new byte[0]; |
204 | m_asset.Metadata.Name = fileName; | 204 | m_asset.Name = fileName; |
205 | m_asset.Metadata.Description = "empty"; | 205 | m_asset.Description = "empty"; |
206 | m_asset.Metadata.Local = true; | 206 | m_asset.Local = true; |
207 | m_asset.Metadata.Temporary = true; | 207 | m_asset.Temporary = true; |
208 | mXferID = Util.GetNextXferID(); | 208 | mXferID = Util.GetNextXferID(); |
209 | } | 209 | } |
210 | 210 | ||
@@ -215,13 +215,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
215 | 215 | ||
216 | public void RequestStartXfer(IClientAPI pRemoteClient) | 216 | public void RequestStartXfer(IClientAPI pRemoteClient) |
217 | { | 217 | { |
218 | if (!String.IsNullOrEmpty(m_asset.Metadata.Name)) | 218 | if (!String.IsNullOrEmpty(m_asset.Name)) |
219 | { | 219 | { |
220 | pRemoteClient.SendXferRequest(mXferID, m_asset.Metadata.Type, m_asset.Metadata.FullID, 0, Utils.StringToBytes(m_asset.Metadata.Name)); | 220 | pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name)); |
221 | } | 221 | } |
222 | else | 222 | else |
223 | { | 223 | { |
224 | pRemoteClient.SendXferRequest(mXferID, m_asset.Metadata.Type, m_asset.Metadata.FullID, 0, new byte[0]); | 224 | pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, new byte[0]); |
225 | } | 225 | } |
226 | } | 226 | } |
227 | 227 | ||
@@ -265,7 +265,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
265 | handlerUploadDone = UploadDone; | 265 | handlerUploadDone = UploadDone; |
266 | if (handlerUploadDone != null) | 266 | if (handlerUploadDone != null) |
267 | { | 267 | { |
268 | handlerUploadDone(m_asset.Metadata.Name, m_asset.Metadata.FullID, mXferID, m_asset.Data, remoteClient); | 268 | handlerUploadDone(m_asset.Name, m_asset.FullID, mXferID, m_asset.Data, remoteClient); |
269 | } | 269 | } |
270 | } | 270 | } |
271 | 271 | ||
@@ -274,7 +274,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
274 | handlerAbort = UploadAborted; | 274 | handlerAbort = UploadAborted; |
275 | if (handlerAbort != null) | 275 | if (handlerAbort != null) |
276 | { | 276 | { |
277 | handlerAbort(m_asset.Metadata.Name, m_asset.Metadata.FullID, mXferID, remoteClient); | 277 | handlerAbort(m_asset.Name, m_asset.FullID, mXferID, remoteClient); |
278 | } | 278 | } |
279 | } | 279 | } |
280 | } | 280 | } |