aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-31 21:48:14 +0000
committerJustin Clarke Casey2008-05-31 21:48:14 +0000
commit8bc5cbb2bcad3bd5801ffe00da96d57542d519f9 (patch)
tree815505e102b771d37f5a2928d339c7ea6a36601d /OpenSim
parent* Change MySQL to check whether an asset already exists before inserting it i... (diff)
downloadopensim-SC_OLD-8bc5cbb2bcad3bd5801ffe00da96d57542d519f9.zip
opensim-SC_OLD-8bc5cbb2bcad3bd5801ffe00da96d57542d519f9.tar.gz
opensim-SC_OLD-8bc5cbb2bcad3bd5801ffe00da96d57542d519f9.tar.bz2
opensim-SC_OLD-8bc5cbb2bcad3bd5801ffe00da96d57542d519f9.tar.xz
* Enable loading of textures in OpenSim archives with load-oar/save-oar
* Right now, this only saves and reloads textures that have been applied to the entire prim (not ones which have been applied to individual faces). * This is work in progress - it is currently experimental, hacky, inefficient, completely unsupported and liable to change rapidly at short notice :)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index 6ad9fb8..a4e1627 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -75,7 +75,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
75 { 75 {
76 serializedPrims = m_asciiEncoding.GetString(data); 76 serializedPrims = m_asciiEncoding.GetString(data);
77 } 77 }
78 /*
79 else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH)) 78 else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
80 { 79 {
81 // Right now we're nastily obtaining the lluuid from the filename 80 // Right now we're nastily obtaining the lluuid from the filename
@@ -96,7 +95,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
96 95
97 m_scene.AssetCache.AddAsset(asset); 96 m_scene.AssetCache.AddAsset(asset);
98 } 97 }
99 */
100 } 98 }
101 99
102 m_log.DebugFormat("[ARCHIVER]: Reached end of archive"); 100 m_log.DebugFormat("[ARCHIVER]: Reached end of archive");