diff options
| author | Justin Clark-Casey (justincc) | 2014-06-16 21:47:34 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-06-16 21:47:34 +0100 |
| commit | 696df33e5c163956e2f54e2223091dd681cfe7f6 (patch) | |
| tree | b26bc20b5a5535a5bf36feb916001a7365e6fe09 /OpenSim/Region/OptionalModules/Materials | |
| parent | Behavior change: only local users can set home in any parcel of a grid. Setti... (diff) | |
| download | opensim-SC-696df33e5c163956e2f54e2223091dd681cfe7f6.zip opensim-SC-696df33e5c163956e2f54e2223091dd681cfe7f6.tar.gz opensim-SC-696df33e5c163956e2f54e2223091dd681cfe7f6.tar.bz2 opensim-SC-696df33e5c163956e2f54e2223091dd681cfe7f6.tar.xz | |
In materials module, if a texture entry somehow has no default entry then don't try to extract materials data rather than throw an exception
Diffstat (limited to 'OpenSim/Region/OptionalModules/Materials')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs index afb788b..5202bbc 100644 --- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs +++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | |||
| @@ -216,7 +216,8 @@ namespace OpenSim.Region.OptionalModules.Materials | |||
| 216 | 216 | ||
| 217 | GetLegacyStoredMaterialsInPart(part); | 217 | GetLegacyStoredMaterialsInPart(part); |
| 218 | 218 | ||
| 219 | GetStoredMaterialInFace(part, te.DefaultTexture); | 219 | if (te.DefaultTexture != null) |
| 220 | GetStoredMaterialInFace(part, te.DefaultTexture); | ||
| 220 | 221 | ||
| 221 | foreach (Primitive.TextureEntryFace face in te.FaceTextures) | 222 | foreach (Primitive.TextureEntryFace face in te.FaceTextures) |
| 222 | { | 223 | { |