diff options
| author | Melanie | 2012-04-03 23:18:07 +0200 |
|---|---|---|
| committer | Melanie | 2012-04-03 23:18:07 +0200 |
| commit | 7154d480b9fe1e2098ac536285f4c3f643e42f0c (patch) | |
| tree | 9a31ac9a437810d3be21abff459d599c17bfe1eb /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Fix merge artefacts (diff) | |
| download | opensim-SC_OLD-7154d480b9fe1e2098ac536285f4c3f643e42f0c.zip opensim-SC_OLD-7154d480b9fe1e2098ac536285f4c3f643e42f0c.tar.gz opensim-SC_OLD-7154d480b9fe1e2098ac536285f4c3f643e42f0c.tar.bz2 opensim-SC_OLD-7154d480b9fe1e2098ac536285f4c3f643e42f0c.tar.xz | |
Remove duplicate implementation of Material { get; set; }
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 9ba3e92..5c28d89 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -571,20 +571,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 571 | } | 571 | } |
| 572 | } | 572 | } |
| 573 | 573 | ||
| 574 | public byte Material | ||
| 575 | { | ||
| 576 | get { return (byte) m_material; } | ||
| 577 | set | ||
| 578 | { | ||
| 579 | m_material = (Material)value; | ||
| 580 | |||
| 581 | PhysicsActor pa = PhysActor; | ||
| 582 | |||
| 583 | if (pa != null) | ||
| 584 | pa.SetMaterial((int)value); | ||
| 585 | } | ||
| 586 | } | ||
| 587 | |||
| 588 | public bool PassTouches | 574 | public bool PassTouches |
| 589 | { | 575 | { |
| 590 | get { return m_passTouches; } | 576 | get { return m_passTouches; } |