diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 2bfcaca77f..5249aa2f86 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -780,9 +780,16 @@ namespace OpenSim.Framework.Communications.Capabilities
 
                 httpListener.RemoveStreamHandler("POST", uploaderPath);
 
+                // TODO: probably make this a better set of extensions here
+                string extension = ".jp2";
+                if (m_invType != "image") 
+                {
+                    extension = ".dat";
+                }
+
                 if (m_dumpAssetsToFile)
                 {
-                    SaveAssetToFile(m_assetName + ".jp2", data);
+                    SaveAssetToFile(m_assetName + extension, data);
                 }
                 handlerUpLoad = OnUpLoad;
                 if (handlerUpLoad != null)