diff options
| author | dahlia | 2013-07-08 17:12:39 -0700 |
|---|---|---|
| committer | dahlia | 2013-07-08 17:12:39 -0700 |
| commit | 33eea62606908ca39ac90eb9c99b0eee3c5f39de (patch) | |
| tree | 610a95ad875f5ca7a8780fef32f0fbebf52b828a /OpenSim/Region/OptionalModules | |
| parent | BulletSim: make all the different angularVerticalAttraction algorithms (diff) | |
| download | opensim-SC_OLD-33eea62606908ca39ac90eb9c99b0eee3c5f39de.zip opensim-SC_OLD-33eea62606908ca39ac90eb9c99b0eee3c5f39de.tar.gz opensim-SC_OLD-33eea62606908ca39ac90eb9c99b0eee3c5f39de.tar.bz2 opensim-SC_OLD-33eea62606908ca39ac90eb9c99b0eee3c5f39de.tar.xz | |
remove an invalid null UUID check which caused a warning
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs index 00504d0..b997d4d 100644 --- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs +++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs | |||
| @@ -416,14 +416,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule | |||
| 416 | if (te.DefaultTexture == null) | 416 | if (te.DefaultTexture == null) |
| 417 | m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture is null"); | 417 | m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture is null"); |
| 418 | else | 418 | else |
| 419 | { | 419 | te.DefaultTexture.MaterialID = id; |
| 420 | if (te.DefaultTexture.MaterialID == null) | ||
| 421 | m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture.MaterialID is null"); | ||
| 422 | else | ||
| 423 | { | ||
| 424 | te.DefaultTexture.MaterialID = id; | ||
| 425 | } | ||
| 426 | } | ||
| 427 | } | 420 | } |
| 428 | else | 421 | else |
| 429 | { | 422 | { |