aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
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/Server
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/Server')
-rw-r--r--OpenSim/Server/Handlers/Asset/AssetServerConnector.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index 46b0c67..4123f49 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
@@ -141,6 +141,9 @@ namespace OpenSim.Server.Handlers.Asset
141 } 141 }
142 142
143 string fileName = rawAssetId; 143 string fileName = rawAssetId;
144
145 if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, fileName))
146 return;
144 147
145 using (FileStream fs = new FileStream(fileName, FileMode.CreateNew)) 148 using (FileStream fs = new FileStream(fileName, FileMode.CreateNew))
146 { 149 {