aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorDiva Canto2014-12-25 08:01:50 -0800
committerDiva Canto2014-12-25 08:01:50 -0800
commit27c34b69bf5960e02b087f9f298dcbe19f03b142 (patch)
treef299009958858da9db464dcbc84bd03beae0ca15 /OpenSim/Server
parentRevert "Update libomv to grab latest bug fixes for Collada upload." (diff)
parentIf a moap entry has EnableWhiteList but WhiteList == null, then properly bloc... (diff)
downloadopensim-SC-27c34b69bf5960e02b087f9f298dcbe19f03b142.zip
opensim-SC-27c34b69bf5960e02b087f9f298dcbe19f03b142.tar.gz
opensim-SC-27c34b69bf5960e02b087f9f298dcbe19f03b142.tar.bz2
opensim-SC-27c34b69bf5960e02b087f9f298dcbe19f03b142.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/BakedTextures/XBakes.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Server/Handlers/BakedTextures/XBakes.cs b/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
index d1b2e12..4e55433 100644
--- a/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
+++ b/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
@@ -107,11 +107,9 @@ namespace OpenSim.Server.Handlers.BakedTextures
107 File.Delete(diskFile); 107 File.Delete(diskFile);
108 108
109 byte[] data = utf8encoding.GetBytes(sdata); 109 byte[] data = utf8encoding.GetBytes(sdata);
110 FileStream fs = File.Create(diskFile);
111 110
112 fs.Write(data, 0, data.Length); 111 using (FileStream fs = File.Create(diskFile))
113 112 fs.Write(data, 0, data.Length);
114 fs.Close();
115 } 113 }
116 114
117 private void HandleDeleteBakes(string module, string[] args) 115 private void HandleDeleteBakes(string module, string[] args)