* exprimental: Export and reimport all items within a prim except Objects

* Not yet ready for public use

1 files changed, 23 insertions, 6 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
index ed5f0e7..2a041dd 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
@@ -78,13 +78,21 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             
             foreach (LLUUID uuid in m_assets.Keys)
             {
-                if (m_assets[uuid] != null)
+                AssetBase asset = m_assets[uuid];
+                
+                if (asset != null)
                 {
                     xtw.WriteStartElement("asset");
                     
-                    AssetBase asset = m_assets[uuid];
+                    string extension = string.Empty;
+                    
+                    if ((sbyte)AssetType.Texture == asset.Type)
+                    {
+                        extension = ArchiveConstants.TEXTURE_EXTENSION;
+                    }
+                    
+                    xtw.WriteElementString("filename", uuid.ToString() + extension);
                     
-                    xtw.WriteElementString("filename", uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION);
                     xtw.WriteElementString("name", asset.Name);
                     xtw.WriteElementString("description", asset.Description);
                     xtw.WriteElementString("asset-type", asset.Type.ToString());
@@ -113,11 +121,20 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                         
             foreach (LLUUID uuid in m_assets.Keys)
             {
-                if (m_assets[uuid] != null)
+                AssetBase asset = m_assets[uuid];
+                
+                if (asset != null)
                 {
+                    string extension = string.Empty;
+                    
+                    if ((sbyte)AssetType.Texture == asset.Type)
+                    {
+                        extension = ArchiveConstants.TEXTURE_EXTENSION;
+                    }
+                    
                     archive.AddFile(
-                        ArchiveConstants.ASSETS_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION,
-                        m_assets[uuid].Data);
+                        ArchiveConstants.ASSETS_PATH + uuid.ToString() + extension,
+                        asset.Data);
                 }
                 else
                 {