diff options
| author | Sean McNamara | 2011-04-23 18:33:08 -0400 |
|---|---|---|
| committer | Sean McNamara | 2011-04-23 18:33:08 -0400 |
| commit | d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9 (patch) | |
| tree | 30a24bf66050c66ebe74b68745c4f1764fe09181 /OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |
| parent | AutoBackup: Removed unneeded imports. (diff) | |
| parent | Added MaxAgents configuration option to RegionConfig.ini allowing region host... (diff) | |
| download | opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.zip opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.tar.gz opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.tar.bz2 opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.tar.xz | |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')
| -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 | { |