aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-06-03 16:52:44 +0000
committerJustin Clarke Casey2008-06-03 16:52:44 +0000
commit4106b2a60104fcecfe2c603c99b0aa3f8947e1ee (patch)
tree23824d1020d14866e51dbbd6db99899107bf9445 /OpenSim/Region/Environment
parenttemporarily disable the last bit of code as it prevents startup on (diff)
downloadopensim-SC_OLD-4106b2a60104fcecfe2c603c99b0aa3f8947e1ee.zip
opensim-SC_OLD-4106b2a60104fcecfe2c603c99b0aa3f8947e1ee.tar.gz
opensim-SC_OLD-4106b2a60104fcecfe2c603c99b0aa3f8947e1ee.tar.bz2
opensim-SC_OLD-4106b2a60104fcecfe2c603c99b0aa3f8947e1ee.tar.xz
* Change single assets/ archiver directory to be textures/ instead
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs7
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs2
3 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs
index faffa2b..bfe635d 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
35 /// <summary> 35 /// <summary>
36 /// Path for the assets held in an archive 36 /// Path for the assets held in an archive
37 /// </summary> 37 /// </summary>
38 public static readonly string ASSETS_PATH = "assets/"; 38 public static readonly string TEXTURES_PATH = "textures/";
39 39
40 /// <summary> 40 /// <summary>
41 /// Extension used for texture assets in archive 41 /// Extension used for texture assets in archive
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index a4e1627..0c5edaa 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -75,10 +75,10 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
75 { 75 {
76 serializedPrims = m_asciiEncoding.GetString(data); 76 serializedPrims = m_asciiEncoding.GetString(data);
77 } 77 }
78 else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH)) 78 else if (filePath.StartsWith(ArchiveConstants.TEXTURES_PATH))
79 { 79 {
80 // Right now we're nastily obtaining the lluuid from the filename 80 // Right now we're nastily obtaining the lluuid from the filename
81 string rawId = filePath.Remove(0, ArchiveConstants.ASSETS_PATH.Length); 81 string rawId = filePath.Remove(0, ArchiveConstants.TEXTURES_PATH.Length);
82 rawId = rawId.Remove(rawId.Length - ArchiveConstants.TEXTURE_EXTENSION.Length); 82 rawId = rawId.Remove(rawId.Length - ArchiveConstants.TEXTURE_EXTENSION.Length);
83 83
84 m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", rawId); 84 m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", rawId);
@@ -86,8 +86,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
86 // Not preserving asset name or description as of yet 86 // Not preserving asset name or description as of yet
87 AssetBase asset = new AssetBase(new LLUUID(rawId), "imported name"); 87 AssetBase asset = new AssetBase(new LLUUID(rawId), "imported name");
88 asset.Description = "imported description"; 88 asset.Description = "imported description";
89 89
90 // Only importing textures right now
91 asset.Type = (sbyte)AssetType.Texture; 90 asset.Type = (sbyte)AssetType.Texture;
92 asset.InvType = (sbyte)InventoryType.Texture; 91 asset.InvType = (sbyte)InventoryType.Texture;
93 92
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
index 935a17f..41bde40 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
@@ -123,7 +123,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
123 if (assets[uuid] != null) 123 if (assets[uuid] != null)
124 { 124 {
125 archive.AddFile( 125 archive.AddFile(
126 ArchiveConstants.ASSETS_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION, 126 ArchiveConstants.TEXTURES_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION,
127 assets[uuid].Data); 127 assets[uuid].Data);
128 } 128 }
129 else 129 else