diff options
author | John Hurliman | 2010-02-22 14:18:59 -0800 |
---|---|---|
committer | John Hurliman | 2010-02-22 14:18:59 -0800 |
commit | df76e95aa2dc9f3f3a0c546761b7624adc183ed0 (patch) | |
tree | 74e7cc684b12ca9b67e01e62bfcf481c1da98eb2 /OpenSim/Region/CoreModules/World | |
parent | Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim i... (diff) | |
download | opensim-SC_OLD-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.zip opensim-SC_OLD-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.gz opensim-SC_OLD-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.bz2 opensim-SC_OLD-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.xz |
Changed asset CreatorID to a string
Diffstat (limited to '')
4 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index f5eda3a..40d6b23 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -347,7 +347,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
347 | 347 | ||
348 | //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); | 348 | //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); |
349 | 349 | ||
350 | AssetBase asset = new AssetBase(new UUID(uuid), String.Empty, assetType, UUID.Zero); | 350 | AssetBase asset = new AssetBase(new UUID(uuid), String.Empty, assetType, UUID.Zero.ToString()); |
351 | asset.Data = data; | 351 | asset.Data = data; |
352 | 352 | ||
353 | // We're relying on the asset service to do the sensible thing and not store the asset if it already | 353 | // We're relying on the asset service to do the sensible thing and not store the asset if it already |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs index 8601cae..2c04008 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | |||
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
158 | 158 | ||
159 | m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename); | 159 | m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename); |
160 | 160 | ||
161 | AssetBase asset = new AssetBase(new UUID(filename), metadata.Name, metadata.AssetType, UUID.Zero); | 161 | AssetBase asset = new AssetBase(new UUID(filename), metadata.Name, metadata.AssetType, UUID.Zero.ToString()); |
162 | asset.Description = metadata.Description; | 162 | asset.Description = metadata.Description; |
163 | asset.Data = data; | 163 | asset.Data = data; |
164 | 164 | ||
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs index d10d4d6..b8d8b10 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
52 | 52 | ||
53 | public EstateTerrainXferHandler(IClientAPI pRemoteClient, string pClientFilename) | 53 | public EstateTerrainXferHandler(IClientAPI pRemoteClient, string pClientFilename) |
54 | { | 54 | { |
55 | m_asset = new AssetBase(UUID.Zero, pClientFilename, type, pRemoteClient.AgentId); | 55 | m_asset = new AssetBase(UUID.Zero, pClientFilename, type, pRemoteClient.AgentId.ToString()); |
56 | m_asset.Data = new byte[0]; | 56 | m_asset.Data = new byte[0]; |
57 | m_asset.Description = "empty"; | 57 | m_asset.Description = "empty"; |
58 | m_asset.Local = true; | 58 | m_asset.Local = true; |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 6ae75a8..b63d014 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -1081,7 +1081,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1081 | m_scene.RegionInfo.RegionSettings.TerrainImageID, | 1081 | m_scene.RegionInfo.RegionSettings.TerrainImageID, |
1082 | "terrainImage_" + m_scene.RegionInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString(), | 1082 | "terrainImage_" + m_scene.RegionInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString(), |
1083 | (sbyte)AssetType.Texture, | 1083 | (sbyte)AssetType.Texture, |
1084 | m_scene.RegionInfo.RegionID); | 1084 | m_scene.RegionInfo.RegionID.ToString()); |
1085 | asset.Data = data; | 1085 | asset.Data = data; |
1086 | asset.Description = m_scene.RegionInfo.RegionName; | 1086 | asset.Description = m_scene.RegionInfo.RegionName; |
1087 | asset.Temporary = temporary; | 1087 | asset.Temporary = temporary; |