aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Asset
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-10-24 03:08:58 +0100
committerJustin Clark-Casey (justincc)2012-10-24 03:08:58 +0100
commitf76dceb90b5a76a7b6a5243c9032996c007c0cf5 (patch)
tree19b99bef42c0c56febfad10835027d3c6f101619 /OpenSim/Region/OptionalModules/Asset
parentAdd "dump object uuid" console command. This allows any object in the scene ... (diff)
downloadopensim-SC_OLD-f76dceb90b5a76a7b6a5243c9032996c007c0cf5.zip
opensim-SC_OLD-f76dceb90b5a76a7b6a5243c9032996c007c0cf5.tar.gz
opensim-SC_OLD-f76dceb90b5a76a7b6a5243c9032996c007c0cf5.tar.bz2
opensim-SC_OLD-f76dceb90b5a76a7b6a5243c9032996c007c0cf5.tar.xz
Get "save oar" and "save iar" to tell you in a more friendly manner if the filename to save already exists, rather than exception throwing.
Also changes ConsoleUtil.CheckFileExists to CheckFileDoesNotExist() since this is more meaningful in the context, even though it does result in double negatives.
Diffstat (limited to 'OpenSim/Region/OptionalModules/Asset')
-rw-r--r--OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs b/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs
index 41ec14f..7639c6c 100644
--- a/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs
@@ -127,6 +127,9 @@ namespace OpenSim.Region.OptionalModules.Asset
127 } 127 }
128 128
129 string fileName = rawAssetId; 129 string fileName = rawAssetId;
130
131 if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, fileName))
132 return;
130 133
131 using (FileStream fs = new FileStream(fileName, FileMode.CreateNew)) 134 using (FileStream fs = new FileStream(fileName, FileMode.CreateNew))
132 { 135 {