Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
						commit
						412503b216
					
				| 
						 | 
					@ -88,7 +88,8 @@ namespace OpenSim.Region.Physics.Meshing
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache");
 | 
					            decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache");
 | 
				
			||||||
            cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps);
 | 
					            cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps);
 | 
				
			||||||
            useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh);
 | 
					            if(mesh_config != null)
 | 
				
			||||||
 | 
					                useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            try
 | 
					            try
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue