aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorMike Mazur2009-02-17 01:36:44 +0000
committerMike Mazur2009-02-17 01:36:44 +0000
commit76c0935ec744f2d230489398f879eb7f42b11d37 (patch)
treea68253554e3899f10b6c341db369ce4a029dfaa5 /OpenSim/Region/ClientStack/LindenUDP
parentMajor change to how appearance is managed, including changes in login and use... (diff)
downloadopensim-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/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs22
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs2
3 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3b8b48f..dd0f6ac 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -7679,7 +7679,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7679 { 7679 {
7680 Transfer.TransferInfo.Params = new byte[20]; 7680 Transfer.TransferInfo.Params = new byte[20];
7681 Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16); 7681 Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16);
7682 int assType = req.AssetInf.Metadata.Type; 7682 int assType = req.AssetInf.Type;
7683 Array.Copy(Utils.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4); 7683 Array.Copy(Utils.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4);
7684 } 7684 }
7685 else if (req.AssetRequestSource == 3) 7685 else if (req.AssetRequestSource == 3)
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 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index 6efe3e1..23ed798 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -405,7 +405,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
405 /// </summary> 405 /// </summary>
406 public UUID AssetId 406 public UUID AssetId
407 { 407 {
408 get { return m_asset_ref.Metadata.FullID; } 408 get { return m_asset_ref.FullID; }
409 } 409 }
410 410
411 /// <summary> 411 /// <summary>