diff options
author | Melanie Thielker | 2008-10-03 12:00:13 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-10-03 12:00:13 +0000 |
commit | 7f007d8ed056359d1e391cb73d9ff5c3b6852a26 (patch) | |
tree | 3241b8ea7d97fb9b1ca094217172d7f38cb75b2d /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |
parent | * EventQueueGet is now working. (diff) | |
download | opensim-SC_OLD-7f007d8ed056359d1e391cb73d9ff5c3b6852a26.zip opensim-SC_OLD-7f007d8ed056359d1e391cb73d9ff5c3b6852a26.tar.gz opensim-SC_OLD-7f007d8ed056359d1e391cb73d9ff5c3b6852a26.tar.bz2 opensim-SC_OLD-7f007d8ed056359d1e391cb73d9ff5c3b6852a26.tar.xz |
Mantis #1360
Thank you, idb, for a patch to implement the packet and plumbing for
the material settings.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index c887b78..9458908 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -181,7 +181,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
181 | //unkown if this will be kept, added as a way of removing the group position from the group class | 181 | //unkown if this will be kept, added as a way of removing the group position from the group class |
182 | protected Vector3 m_groupPosition; | 182 | protected Vector3 m_groupPosition; |
183 | protected uint m_localId; | 183 | protected uint m_localId; |
184 | protected Material m_material = 0; | 184 | protected Material m_material = (Material)3; // Wood |
185 | protected string m_name; | 185 | protected string m_name; |
186 | protected Vector3 m_offsetPosition; | 186 | protected Vector3 m_offsetPosition; |
187 | 187 | ||
@@ -2106,7 +2106,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2106 | byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; | 2106 | byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; |
2107 | remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, | 2107 | remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, |
2108 | lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID, | 2108 | lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID, |
2109 | m_text, color, _parentID, m_particleSystem, m_clickAction, m_TextureAnimation, IsAttachment, | 2109 | m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment, |
2110 | AttachmentPoint,FromAssetID, Sound, SoundGain, SoundFlags, SoundRadius); | 2110 | AttachmentPoint,FromAssetID, Sound, SoundGain, SoundFlags, SoundRadius); |
2111 | } | 2111 | } |
2112 | 2112 | ||