aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs12
-rw-r--r--OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs2
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 62f947c..20a5bb4 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.Physics.Meshing
71#endif 71#endif
72 72
73 private bool cacheSculptMaps = true; 73 private bool cacheSculptMaps = true;
74 private string decodedScultMapPath = null; 74 private string decodedSculptMapPath = null;
75 75
76 private float minSizeForComplexMesh = 0.2f; // prims with all dimensions smaller than this will have a bounding box mesh 76 private float minSizeForComplexMesh = 0.2f; // prims with all dimensions smaller than this will have a bounding box mesh
77 77
@@ -81,16 +81,16 @@ namespace OpenSim.Region.Physics.Meshing
81 { 81 {
82 IConfig start_config = config.Configs["Startup"]; 82 IConfig start_config = config.Configs["Startup"];
83 83
84 decodedScultMapPath = start_config.GetString("DecodedSculpMapPath","j2kDecodeCache"); 84 decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache");
85 85
86 try 86 try
87 { 87 {
88 if (!Directory.Exists(decodedScultMapPath)) 88 if (!Directory.Exists(decodedSculptMapPath))
89 Directory.CreateDirectory(decodedScultMapPath); 89 Directory.CreateDirectory(decodedSculptMapPath);
90 } 90 }
91 catch (Exception e) 91 catch (Exception e)
92 { 92 {
93 m_log.WarnFormat("[SCULPT]: Unable to create {0} directory: ", decodedScultMapPath, e.Message); 93 m_log.WarnFormat("[SCULPT]: Unable to create {0} directory: ", decodedSculptMapPath, e.Message);
94 } 94 }
95 95
96 } 96 }
@@ -265,7 +265,7 @@ namespace OpenSim.Region.Physics.Meshing
265 { 265 {
266 if (cacheSculptMaps && primShape.SculptTexture != UUID.Zero) 266 if (cacheSculptMaps && primShape.SculptTexture != UUID.Zero)
267 { 267 {
268 decodedSculptFileName = System.IO.Path.Combine(decodedScultMapPath, "smap_" + primShape.SculptTexture.ToString()); 268 decodedSculptFileName = System.IO.Path.Combine(decodedSculptMapPath, "smap_" + primShape.SculptTexture.ToString());
269 try 269 try
270 { 270 {
271 if (File.Exists(decodedSculptFileName)) 271 if (File.Exists(decodedSculptFileName))
diff --git a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
index ab8f8bf..a7f8baa 100644
--- a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
+++ b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Physics.OdePlugin
50 { 50 {
51 IConfigSource TopConfig = new IniConfigSource(); 51 IConfigSource TopConfig = new IniConfigSource();
52 IConfig config = TopConfig.AddConfig("Startup"); 52 IConfig config = TopConfig.AddConfig("Startup");
53 config.Set("DecodedSculpMapPath","j2kDecodeCache"); 53 config.Set("DecodedSculptMapPath","j2kDecodeCache");
54 54
55 // Loading ODEPlugin 55 // Loading ODEPlugin
56 cbt = new OdePlugin(); 56 cbt = new OdePlugin();