aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World
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/CoreModules/World
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/CoreModules/World')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs16
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs16
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs10
5 files changed, 24 insertions, 24 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 66fc43b..d7ab5fd 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
294 //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); 294 //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType);
295 295
296 AssetBase asset = new AssetBase(new UUID(uuid), String.Empty); 296 AssetBase asset = new AssetBase(new UUID(uuid), String.Empty);
297 asset.Metadata.Type = assetType; 297 asset.Type = assetType;
298 asset.Data = data; 298 asset.Data = data;
299 299
300 m_scene.CommsManager.AssetCache.AddAsset(asset); 300 m_scene.CommsManager.AssetCache.AddAsset(asset);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index b3286f6..abd90de 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -86,16 +86,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
86 86
87 string extension = string.Empty; 87 string extension = string.Empty;
88 88
89 if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Metadata.Type)) 89 if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Type))
90 { 90 {
91 extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Metadata.Type]; 91 extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Type];
92 } 92 }
93 93
94 xtw.WriteElementString("filename", uuid.ToString() + extension); 94 xtw.WriteElementString("filename", uuid.ToString() + extension);
95 95
96 xtw.WriteElementString("name", asset.Metadata.Name); 96 xtw.WriteElementString("name", asset.Name);
97 xtw.WriteElementString("description", asset.Metadata.Description); 97 xtw.WriteElementString("description", asset.Description);
98 xtw.WriteElementString("asset-type", asset.Metadata.Type.ToString()); 98 xtw.WriteElementString("asset-type", asset.Type.ToString());
99 99
100 xtw.WriteEndElement(); 100 xtw.WriteEndElement();
101 } 101 }
@@ -123,15 +123,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
123 123
124 string extension = string.Empty; 124 string extension = string.Empty;
125 125
126 if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Metadata.Type)) 126 if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Type))
127 { 127 {
128 extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Metadata.Type]; 128 extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Type];
129 } 129 }
130 else 130 else
131 { 131 {
132 m_log.ErrorFormat( 132 m_log.ErrorFormat(
133 "[ARCHIVER]: Unrecognized asset type {0} with uuid {1}. This asset will be saved but not reloaded", 133 "[ARCHIVER]: Unrecognized asset type {0} with uuid {1}. This asset will be saved but not reloaded",
134 asset.Metadata.Type, asset.Metadata.ID); 134 asset.Type, asset.ID);
135 } 135 }
136 136
137 archive.AddFile( 137 archive.AddFile(
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
index 743f9a1..cb267d7 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
@@ -157,8 +157,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
157 m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename); 157 m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename);
158 158
159 AssetBase asset = new AssetBase(new UUID(filename), metadata.Name); 159 AssetBase asset = new AssetBase(new UUID(filename), metadata.Name);
160 asset.Metadata.Description = metadata.Description; 160 asset.Description = metadata.Description;
161 asset.Metadata.Type = metadata.AssetType; 161 asset.Type = metadata.AssetType;
162 asset.Data = data; 162 asset.Data = data;
163 163
164 m_cache.AddAsset(asset); 164 m_cache.AddAsset(asset);
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 }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index e1c3d85..4f98e8b 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -985,14 +985,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
985 m_scene.RegionInfo.RegionSettings.TerrainImageID = TerrainImageUUID; 985 m_scene.RegionInfo.RegionSettings.TerrainImageID = TerrainImageUUID;
986 986
987 AssetBase asset = new AssetBase(); 987 AssetBase asset = new AssetBase();
988 asset.Metadata.FullID = m_scene.RegionInfo.RegionSettings.TerrainImageID; 988 asset.FullID = m_scene.RegionInfo.RegionSettings.TerrainImageID;
989 asset.Data = data; 989 asset.Data = data;
990 asset.Metadata.Name 990 asset.Name
991 = "terrainImage_" + m_scene.RegionInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString(); 991 = "terrainImage_" + m_scene.RegionInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString();
992 asset.Metadata.Description = m_scene.RegionInfo.RegionName; 992 asset.Description = m_scene.RegionInfo.RegionName;
993 993
994 asset.Metadata.Type = 0; 994 asset.Type = 0;
995 asset.Metadata.Temporary = temporary; 995 asset.Temporary = temporary;
996 m_scene.CommsManager.AssetCache.AddAsset(asset); 996 m_scene.CommsManager.AssetCache.AddAsset(asset);
997 } 997 }
998 998