aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-06-13 19:41:13 +0000
committerSean Dague2008-06-13 19:41:13 +0000
commitb47dd079326ae55e23f60a3de8e5fb2d2e62ae30 (patch)
tree9850a9a5afef9caf61271ca82450b0eb56bef741
parentthe first pass at Asset Fridays. Contribution of a handshake (diff)
downloadopensim-SC_OLD-b47dd079326ae55e23f60a3de8e5fb2d2e62ae30.zip
opensim-SC_OLD-b47dd079326ae55e23f60a3de8e5fb2d2e62ae30.tar.gz
opensim-SC_OLD-b47dd079326ae55e23f60a3de8e5fb2d2e62ae30.tar.bz2
opensim-SC_OLD-b47dd079326ae55e23f60a3de8e5fb2d2e62ae30.tar.xz
save_assets_to_file path shouldn't always assume uploaded
content are images and use .jp2 for the file extension.
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 2bfcaca..5249aa2 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -780,9 +780,16 @@ namespace OpenSim.Framework.Communications.Capabilities
780 780
781 httpListener.RemoveStreamHandler("POST", uploaderPath); 781 httpListener.RemoveStreamHandler("POST", uploaderPath);
782 782
783 // TODO: probably make this a better set of extensions here
784 string extension = ".jp2";
785 if (m_invType != "image")
786 {
787 extension = ".dat";
788 }
789
783 if (m_dumpAssetsToFile) 790 if (m_dumpAssetsToFile)
784 { 791 {
785 SaveAssetToFile(m_assetName + ".jp2", data); 792 SaveAssetToFile(m_assetName + extension, data);
786 } 793 }
787 handlerUpLoad = OnUpLoad; 794 handlerUpLoad = OnUpLoad;
788 if (handlerUpLoad != null) 795 if (handlerUpLoad != null)