From 0c03a48fb2060eda4d288e2d2ca4e650ce000b4b Mon Sep 17 00:00:00 2001 From: Mike Mazur Date: Wed, 4 Feb 2009 00:01:36 +0000 Subject: - add OpenSim.Framework.AssetMetadata class. AssetBase is now composed of it - trim trailing whitespace --- .../Modules/World/Archiver/ArchiveReadRequest.cs | 46 +++++++++++----------- .../Modules/World/Archiver/AssetsArchiver.cs | 16 ++++---- .../Modules/World/Archiver/AssetsDearchiver.cs | 4 +- .../World/Estate/EstateTerrainXferHandler.cs | 28 ++++++------- 4 files changed, 47 insertions(+), 47 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/World') diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs index 4e9fcef..c860d01 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs @@ -66,12 +66,12 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver m_loadStream = new GZipStream(GetStream(loadPath), CompressionMode.Decompress); m_errorMessage = String.Empty; } - + public ArchiveReadRequest(Scene scene, Stream loadStream) { m_scene = scene; m_loadStream = loadStream; - } + } /// /// Dearchive the region embodied in this request. @@ -81,7 +81,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver // The same code can handle dearchiving 0.1 and 0.2 OpenSim Archive versions DearchiveRegion0DotStar(); } - + private void DearchiveRegion0DotStar() { int successfulAssetRestores = 0; @@ -98,12 +98,12 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver byte[] data; TarArchiveReader.TarEntryType entryType; - + while ((data = archive.ReadEntry(out filePath, out entryType)) != null) { //m_log.DebugFormat( // "[ARCHIVER]: Successfully read {0} ({1} bytes)}", filePath, data.Length); - if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType) + if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType) { m_log.WarnFormat("[ARCHIVER]: Ignoring directory entry {0}", filePath); @@ -133,7 +133,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver LoadRegionSettings(filePath, data); } } - + //m_log.Debug("[ARCHIVER]: Reached end of archive"); archive.Close(); @@ -154,10 +154,10 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver m_log.ErrorFormat("[ARCHIVER]: Failed to load {0} assets", failedAssetRestores); m_errorMessage += String.Format("Failed to load {0} assets", failedAssetRestores); } - + m_log.Info("[ARCHIVER]: Clearing all existing scene objects"); m_scene.DeleteAllSceneObjects(); - + // Reload serialized prims m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); @@ -176,10 +176,10 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver // Try to retain the original creator/owner/lastowner if their uuid is present on this grid // otherwise, use the master avatar uuid instead UUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID; - + if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) masterAvatarId = m_scene.RegionInfo.EstateSettings.EstateOwner; - + foreach (SceneObjectPart part in sceneObject.Children.Values) { if (!resolveUserUuid(part.CreatorID)) @@ -233,7 +233,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver { sceneObject.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 0); } - + m_scene.EventManager.TriggerOarFileLoaded(m_errorMessage); } @@ -290,12 +290,12 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); AssetBase asset = new AssetBase(new UUID(uuid), String.Empty); - asset.Type = assetType; + asset.Metadata.Type = assetType; asset.Data = data; m_scene.AssetCache.AddAsset(asset); - - /** + + /** * Create layers on decode for image assets. This is likely to significantly increase the time to load archives so * it might be best done when dearchive takes place on a separate thread if (asset.Type=AssetType.Texture) @@ -317,7 +317,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver return false; } } - + /// /// Load region settings data /// @@ -329,7 +329,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver private bool LoadRegionSettings(string settingsPath, byte[] data) { RegionSettings loadedRegionSettings; - + try { loadedRegionSettings = RegionSettingsSerializer.Deserialize(data); @@ -337,13 +337,13 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver catch (Exception e) { m_log.ErrorFormat( - "[ARCHIVER]: Could not parse region settings file {0}. Ignoring. Exception was {1}", + "[ARCHIVER]: Could not parse region settings file {0}. Ignoring. Exception was {1}", settingsPath, e); return false; } - + RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings; - + currentRegionSettings.AgentLimit = loadedRegionSettings.AgentLimit; currentRegionSettings.AllowDamage = loadedRegionSettings.AllowDamage; currentRegionSettings.AllowLandJoinDivide = loadedRegionSettings.AllowLandJoinDivide; @@ -373,10 +373,10 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver currentRegionSettings.TerrainTexture4 = loadedRegionSettings.TerrainTexture4; currentRegionSettings.UseEstateSun = loadedRegionSettings.UseEstateSun; currentRegionSettings.WaterHeight = loadedRegionSettings.WaterHeight; - + IEstateModule estateModule = m_scene.RequestModuleInterface(); estateModule.sendRegionHandshakeToAll(); - + return true; } @@ -411,11 +411,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver if (File.Exists(path)) { return new FileStream(path, FileMode.Open); - } + } else { Uri uri = new Uri(path); // throw exception if not valid URI - if (uri.Scheme == "file") + if (uri.Scheme == "file") { return new FileStream(uri.AbsolutePath, FileMode.Open); } diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs index 75ae474..36a60f3 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs @@ -86,16 +86,16 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver string extension = string.Empty; - if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Type)) + if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Metadata.Type)) { - extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Type]; + extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Metadata.Type]; } xtw.WriteElementString("filename", uuid.ToString() + extension); - xtw.WriteElementString("name", asset.Name); - xtw.WriteElementString("description", asset.Description); - xtw.WriteElementString("asset-type", asset.Type.ToString()); + xtw.WriteElementString("name", asset.Metadata.Name); + xtw.WriteElementString("description", asset.Metadata.Description); + xtw.WriteElementString("asset-type", asset.Metadata.Type.ToString()); xtw.WriteEndElement(); } @@ -123,15 +123,15 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver string extension = string.Empty; - if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Type)) + if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Metadata.Type)) { - extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Type]; + extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Metadata.Type]; } else { m_log.ErrorFormat( "[ARCHIVER]: Unrecognized asset type {0} with uuid {1}. This asset will be saved but not reloaded", - asset.Type, asset.ID); + asset.Metadata.Type, asset.Metadata.ID); } archive.AddFile( diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs index b26fe4c..0ef1e1d 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs @@ -157,8 +157,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename); AssetBase asset = new AssetBase(new UUID(filename), metadata.Name); - asset.Description = metadata.Description; - asset.Type = metadata.AssetType; + asset.Metadata.Description = metadata.Description; + asset.Metadata.Type = metadata.AssetType; asset.Data = data; m_cache.AddAsset(asset); diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs index 6d69443..2ba4e34 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs @@ -37,13 +37,13 @@ using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.Modules.World.Estate { - + public class EstateTerrainXferHandler { //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private AssetBase m_asset; - + public delegate void TerrainUploadComplete(string name, byte[] filedata, IClientAPI remoteClient); public event TerrainUploadComplete TerrainUploadDone; @@ -52,21 +52,21 @@ namespace OpenSim.Region.Environment.Modules.World.Estate //private string m_name = String.Empty; //private UUID TransactionID = UUID.Zero; private sbyte type = 0; - + public ulong mXferID; private TerrainUploadComplete handlerTerrainUploadDone; public EstateTerrainXferHandler(IClientAPI pRemoteClient, string pClientFilename) { - + m_asset = new AssetBase(); - m_asset.FullID = UUID.Zero; - m_asset.Type = type; + m_asset.Metadata.FullID = UUID.Zero; + m_asset.Metadata.Type = type; m_asset.Data = new byte[0]; - m_asset.Name = pClientFilename; - m_asset.Description = "empty"; - m_asset.Local = true; - m_asset.Temporary = true; + m_asset.Metadata.Name = pClientFilename; + m_asset.Metadata.Description = "empty"; + m_asset.Metadata.Local = true; + m_asset.Metadata.Temporary = true; } @@ -78,7 +78,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate public void RequestStartXfer(IClientAPI pRemoteClient) { mXferID = Util.GetNextXferID(); - pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name)); + pRemoteClient.SendXferRequest(mXferID, m_asset.Metadata.Type, m_asset.Metadata.FullID, 0, Utils.StringToBytes(m_asset.Metadata.Name)); } /// @@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate /// /// /// - /// + /// public void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data) { if (mXferID == xferID) @@ -110,7 +110,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate if ((packetID & 0x80000000) != 0) { SendCompleteMessage(remoteClient); - + } } } @@ -120,7 +120,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate handlerTerrainUploadDone = TerrainUploadDone; if (handlerTerrainUploadDone != null) { - handlerTerrainUploadDone(m_asset.Name,m_asset.Data, remoteClient); + handlerTerrainUploadDone(m_asset.Metadata.Name, m_asset.Data, remoteClient); } } } -- cgit v1.1