diff options
| author | Mic Bowman | 2011-04-25 08:41:21 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-25 08:41:21 -0700 |
| commit | 1d7c83c39fffe6580f4cf1c693581979c97d7eaa (patch) | |
| tree | e600e4551ba957aa47dfbba7925c65ee7d06ccfc /OpenSim/Region/Physics | |
| parent | Fix a bug looping through the priority queues. This should fix the problem (diff) | |
| parent | Removed unused libraries: RAILS.dll and dependencies. (diff) | |
| download | opensim-SC_OLD-1d7c83c39fffe6580f4cf1c693581979c97d7eaa.zip opensim-SC_OLD-1d7c83c39fffe6580f4cf1c693581979c97d7eaa.tar.gz opensim-SC_OLD-1d7c83c39fffe6580f4cf1c693581979c97d7eaa.tar.bz2 opensim-SC_OLD-1d7c83c39fffe6580f4cf1c693581979c97d7eaa.tar.xz | |
Merge branch 'master' into queuetest
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 211a0a7..64774d8 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
| @@ -84,10 +84,11 @@ namespace OpenSim.Region.Physics.Meshing | |||
| 84 | public Meshmerizer(IConfigSource config) | 84 | public Meshmerizer(IConfigSource config) |
| 85 | { | 85 | { |
| 86 | IConfig start_config = config.Configs["Startup"]; | 86 | IConfig start_config = config.Configs["Startup"]; |
| 87 | IConfig mesh_config = config.Configs["Mesh"]; | ||
| 87 | 88 | ||
| 88 | decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache"); | 89 | decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache"); |
| 89 | cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps); | 90 | cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps); |
| 90 | useMeshiesPhysicsMesh = start_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh); | 91 | useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh); |
| 91 | 92 | ||
| 92 | try | 93 | try |
| 93 | { | 94 | { |