diff options
| author | Melanie Thielker | 2017-02-01 16:34:49 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2017-02-01 16:34:49 +0000 |
| commit | 202fcc7d6fb94622cec208b9165e4effda60501c (patch) | |
| tree | d224c59768dad96e2b524bc3a1c3c0078816e046 /OpenSim/Region/OptionalModules | |
| parent | update parcel select or sat on stats on sit and stand (diff) | |
| parent | Refactor part II (diff) | |
| download | opensim-SC-202fcc7d6fb94622cec208b9165e4effda60501c.zip opensim-SC-202fcc7d6fb94622cec208b9165e4effda60501c.tar.gz opensim-SC-202fcc7d6fb94622cec208b9165e4effda60501c.tar.bz2 opensim-SC-202fcc7d6fb94622cec208b9165e4effda60501c.tar.xz | |
Merge branch 'melanie'
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs index 52fa908..e8cb052 100644 --- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs +++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | |||
| @@ -329,7 +329,7 @@ namespace OpenSim.Region.OptionalModules.Materials | |||
| 329 | AssetBase matAsset = m_scene.AssetService.Get(id.ToString()); | 329 | AssetBase matAsset = m_scene.AssetService.Get(id.ToString()); |
| 330 | if (matAsset == null || matAsset.Data == null || matAsset.Data.Length == 0 ) | 330 | if (matAsset == null || matAsset.Data == null || matAsset.Data.Length == 0 ) |
| 331 | { | 331 | { |
| 332 | m_log.WarnFormat("[Materials]: Prim \"{0}\" ({1}) contains unknown material ID {2}", part.Name, part.UUID, id); | 332 | //m_log.WarnFormat("[Materials]: Prim \"{0}\" ({1}) contains unknown material ID {2}", part.Name, part.UUID, id); |
| 333 | return; | 333 | return; |
| 334 | } | 334 | } |
| 335 | 335 | ||