aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authoropensim mirror account2010-10-18 04:30:07 -0700
committeropensim mirror account2010-10-18 04:30:07 -0700
commitc48b051c71bc135f1dc3eb8b66fe29e24bd025af (patch)
tree5e4757dd83526a9a5f5f8059f354c968353ec487 /OpenSim
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentremove some cruft from last commit (diff)
downloadopensim-SC_OLD-c48b051c71bc135f1dc3eb8b66fe29e24bd025af.zip
opensim-SC_OLD-c48b051c71bc135f1dc3eb8b66fe29e24bd025af.tar.gz
opensim-SC_OLD-c48b051c71bc135f1dc3eb8b66fe29e24bd025af.tar.bz2
opensim-SC_OLD-c48b051c71bc135f1dc3eb8b66fe29e24bd025af.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs8
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 89ee5af..72dce6d 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -307,14 +307,6 @@ namespace OpenSim.Region.Physics.Meshing
307 byte[] decompressed = new byte[physSize * 5]; 307 byte[] decompressed = new byte[physSize * 5];
308 try 308 try
309 { 309 {
310 {
311 string filename = System.IO.Path.Combine(decodedSculptMapPath, "meshInput_" + primShape.SculptTexture.ToString());
312 using (FileStream fs = new FileStream(filename, FileMode.Create))
313 {
314 fs.Write(meshBytes, 0, meshBytes.Length);
315 }
316 }
317
318 using (MemoryStream inMs = new MemoryStream(meshBytes)) 310 using (MemoryStream inMs = new MemoryStream(meshBytes))
319 { 311 {
320 using (MemoryStream outMs = new MemoryStream()) 312 using (MemoryStream outMs = new MemoryStream())