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/World/Estate | |
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 '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs index 1f2d5db..93e79f0 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs | |||
@@ -54,13 +54,13 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
54 | { | 54 | { |
55 | 55 | ||
56 | m_asset = new AssetBase(); | 56 | m_asset = new AssetBase(); |
57 | m_asset.Metadata.FullID = UUID.Zero; | 57 | m_asset.FullID = UUID.Zero; |
58 | m_asset.Metadata.Type = type; | 58 | m_asset.Type = type; |
59 | m_asset.Data = new byte[0]; | 59 | m_asset.Data = new byte[0]; |
60 | m_asset.Metadata.Name = pClientFilename; | 60 | m_asset.Name = pClientFilename; |
61 | m_asset.Metadata.Description = "empty"; | 61 | m_asset.Description = "empty"; |
62 | m_asset.Metadata.Local = true; | 62 | m_asset.Local = true; |
63 | m_asset.Metadata.Temporary = true; | 63 | m_asset.Temporary = true; |
64 | 64 | ||
65 | } | 65 | } |
66 | 66 | ||
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
72 | public void RequestStartXfer(IClientAPI pRemoteClient) | 72 | public void RequestStartXfer(IClientAPI pRemoteClient) |
73 | { | 73 | { |
74 | mXferID = Util.GetNextXferID(); | 74 | mXferID = Util.GetNextXferID(); |
75 | pRemoteClient.SendXferRequest(mXferID, m_asset.Metadata.Type, m_asset.Metadata.FullID, 0, Utils.StringToBytes(m_asset.Metadata.Name)); | 75 | pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name)); |
76 | } | 76 | } |
77 | 77 | ||
78 | /// <summary> | 78 | /// <summary> |
@@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
114 | handlerTerrainUploadDone = TerrainUploadDone; | 114 | handlerTerrainUploadDone = TerrainUploadDone; |
115 | if (handlerTerrainUploadDone != null) | 115 | if (handlerTerrainUploadDone != null) |
116 | { | 116 | { |
117 | handlerTerrainUploadDone(m_asset.Metadata.Name, m_asset.Data, remoteClient); | 117 | handlerTerrainUploadDone(m_asset.Name, m_asset.Data, remoteClient); |
118 | } | 118 | } |
119 | } | 119 | } |
120 | } | 120 | } |