Mantis #1360

Thank you, idb, for a patch to implement the packet and plumbing for
the material settings.

7 files changed, 46 insertions, 12 deletions

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index ad4e22b..8737c22 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -422,6 +422,7 @@ namespace OpenSim.Framework
         event GenericCall7 OnObjectDescription;
         event GenericCall7 OnObjectName;
         event GenericCall7 OnObjectClickAction;
+        event GenericCall7 OnObjectMaterial;
         event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
         event UpdatePrimFlags OnUpdatePrimFlags;
         event UpdatePrimTexture OnUpdatePrimTexture;
@@ -593,13 +594,13 @@ namespace OpenSim.Framework
                                    Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel,
                                    uint flags,
                                    UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem,
-                                   byte clickAction, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius);
+                                   byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius);
 
 
         void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
                                           Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel,
                                           uint flags, UUID objectID, UUID ownerID, string text, byte[] color,
-                                   uint parentID, byte[] particleSystem, byte clickAction);
+                                   uint parentID, byte[] particleSystem, byte clickAction, byte material);
 
 
         void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index aae41fe..1c7bbec 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -172,6 +172,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private GenericCall7 handlerObjectDescription = null;
         private GenericCall7 handlerObjectName = null;
         private GenericCall7 handlerObjectClickAction = null;
+        private GenericCall7 handlerObjectMaterial = null;
         private ObjectPermissions handlerObjectPermissions = null;
         private RequestObjectPropertiesFamily handlerRequestObjectPropertiesFamily = null; //OnRequestObjectPropertiesFamily;
         private TextureRequest handlerTextureRequest = null;
@@ -870,6 +871,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event GenericCall7 OnObjectDescription;
         public event GenericCall7 OnObjectName;
         public event GenericCall7 OnObjectClickAction;
+        public event GenericCall7 OnObjectMaterial;
         public event ObjectIncludeInSearch OnObjectIncludeInSearch;
         public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
         public event UpdatePrimFlags OnUpdatePrimFlags;
@@ -2395,14 +2397,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                           ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
                                           Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel,
                                           uint flags, UUID objectID, UUID ownerID, string text, byte[] color,
-                                          uint parentID, byte[] particleSystem, byte clickAction)
+                                          uint parentID, byte[] particleSystem, byte clickAction, byte material)
         {
             byte[] textureanim = new byte[0];
 
             SendPrimitiveToClient(regionHandle, timeDilation, localID, primShape, pos, vel,
                                   acc, rotation, rvel, flags,
                                   objectID, ownerID, text, color, parentID, particleSystem,
-                                  clickAction, textureanim, false, (uint)0, UUID.Zero, UUID.Zero, 0, 0, 0);
+                                  clickAction, material, textureanim, false, (uint)0, UUID.Zero, UUID.Zero, 0, 0, 0);
         }
 
         public void SendPrimitiveToClient(
@@ -2410,7 +2412,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             Vector3 pos, Vector3 velocity, Vector3 acceleration, Quaternion rotation, Vector3 rotational_velocity,
             uint flags,
             UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem,
-            byte clickAction, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundGain, byte SoundFlags, double SoundRadius)
+            byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundGain, byte SoundFlags, double SoundRadius)
         {
 
             if (rotation.X == rotation.Y && rotation.Y == rotation.Z && rotation.Z == rotation.W && rotation.W == 0)
@@ -2447,6 +2449,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             outPacket.ObjectData[0].ParentID = parentID;
             outPacket.ObjectData[0].PSBlock = particleSystem;
             outPacket.ObjectData[0].ClickAction = clickAction;
+            outPacket.ObjectData[0].Material = material;
             outPacket.ObjectData[0].Flags = 0;
 
             if (attachment)
@@ -4865,6 +4868,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                          }
                          break;
 
+                     case PacketType.ObjectMaterial:
+                         ObjectMaterialPacket ompacket = (ObjectMaterialPacket)Pack;
+
+                         handlerObjectMaterial = OnObjectMaterial;
+                         if (handlerObjectMaterial != null)
+                         {
+                             foreach (ObjectMaterialPacket.ObjectDataBlock odata in ompacket.ObjectData)
+                             {
+                                 byte material = odata.Material;
+                                 uint localID = odata.ObjectLocalID;
+                                 handlerObjectMaterial(this, localID, material.ToString());
+                             }
+                         }
+                         break;
+
                     #endregion
 
                     #region Inventory/Asset/Other related packets
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 9300b92..78aee92 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -212,6 +212,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
         public event GenericCall7 OnObjectDescription;
         public event GenericCall7 OnObjectName;
         public event GenericCall7 OnObjectClickAction;
+        public event GenericCall7 OnObjectMaterial;
         public event UpdatePrimFlags OnUpdatePrimFlags;
         public event UpdatePrimTexture OnUpdatePrimTexture;
         public event UpdateVector OnUpdatePrimGroupPosition;
@@ -559,7 +560,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
                                                   Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags,
                                                   UUID objectID, UUID ownerID, string text, byte[] color,
                                                   uint parentID,
-                                                  byte[] particleSystem, byte clickAction)
+                                                  byte[] particleSystem, byte clickAction, byte material)
         {
         }
         public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
@@ -567,7 +568,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
                                                   Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags,
                                                   UUID objectID, UUID ownerID, string text, byte[] color,
                                                   uint parentID,
-                                                  byte[] particleSystem, byte clickAction, byte[] textureanimation,
+                                                  byte[] particleSystem, byte clickAction, byte material, byte[] textureanimation,
                                                   bool attachment, uint AttachmentPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius)
         {
         }
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 3be1592..d63544a 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1258,7 +1258,19 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
-
+        protected internal void PrimMaterial(IClientAPI remoteClient, uint primLocalID, string material)
+        {
+            SceneObjectGroup group = GetGroupByPrim(primLocalID);
+            if (group != null)
+            {
+                if (m_parentScene.ExternalChecks.ExternalChecksCanEditObject(group.UUID, remoteClient.AgentId))
+                {
+                    SceneObjectPart part = m_parentScene.GetSceneObjectPart(primLocalID);
+                    part.Material = Convert.ToByte(material);
+                    group.HasGroupChanged = true;
+                }
+            }
+        }
 
         protected internal void UpdateExtraParam(UUID agentID, uint primLocalID, ushort type, bool inUse, byte[] data)
         {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index bbc50e6..8f8c89e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2158,6 +2158,7 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnObjectDescription += m_innerScene.PrimDescription;
             client.OnObjectName += m_innerScene.PrimName;
             client.OnObjectClickAction += m_innerScene.PrimClickAction;
+            client.OnObjectMaterial += m_innerScene.PrimMaterial;
             client.OnLinkObjects += m_innerScene.LinkObjects;
             client.OnDelinkObjects += m_innerScene.DelinkObjects;
             client.OnObjectDuplicate += m_innerScene.DuplicateObject;
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
         //unkown if this will be kept, added as a way of removing the group position from the group class
         protected Vector3 m_groupPosition;
         protected uint m_localId;
-        protected Material m_material = 0;
+        protected Material m_material = (Material)3; // Wood
         protected string m_name;
         protected Vector3 m_offsetPosition;
 
@@ -2106,7 +2106,7 @@ namespace OpenSim.Region.Environment.Scenes
             byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
             remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
                                                lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID,
-                                               m_text, color, _parentID, m_particleSystem, m_clickAction, m_TextureAnimation, IsAttachment,
+                                               m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment,
                                                AttachmentPoint,FromAssetID, Sound, SoundGain, SoundFlags, SoundRadius);
         }
 
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 2b8bcb1..6d69247 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -107,6 +107,7 @@ namespace OpenSim.Region.Examples.SimpleModule
         public event GenericCall7 OnObjectDescription;
         public event GenericCall7 OnObjectName;
         public event GenericCall7 OnObjectClickAction;
+        public event GenericCall7 OnObjectMaterial;
         public event UpdatePrimFlags OnUpdatePrimFlags;
         public event UpdatePrimTexture OnUpdatePrimTexture;
         public event UpdateVector OnUpdatePrimGroupPosition;
@@ -473,7 +474,7 @@ namespace OpenSim.Region.Examples.SimpleModule
                                                   Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags,
                                                   UUID objectID, UUID ownerID, string text, byte[] color,
                                                   uint parentID,
-                                                  byte[] particleSystem, byte clickAction)
+                                                  byte[] particleSystem, byte clickAction, byte material)
         {
         }
         public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
@@ -481,7 +482,7 @@ namespace OpenSim.Region.Examples.SimpleModule
                                                   Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags,
                                                   UUID objectID, UUID ownerID, string text, byte[] color,
                                                   uint parentID,
-                                                  byte[] particleSystem, byte clickAction, byte[] textureanimation,
+                                                  byte[] particleSystem, byte clickAction, byte material, byte[] textureanimation,
                                                   bool attachment, uint AttachmentPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius)
         {
         }