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/Modules | |
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 'OpenSim/Region/Environment/Modules')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | 5 |
1 files changed, 3 insertions, 2 deletions
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 | |||
212 | public event GenericCall7 OnObjectDescription; | 212 | public event GenericCall7 OnObjectDescription; |
213 | public event GenericCall7 OnObjectName; | 213 | public event GenericCall7 OnObjectName; |
214 | public event GenericCall7 OnObjectClickAction; | 214 | public event GenericCall7 OnObjectClickAction; |
215 | public event GenericCall7 OnObjectMaterial; | ||
215 | public event UpdatePrimFlags OnUpdatePrimFlags; | 216 | public event UpdatePrimFlags OnUpdatePrimFlags; |
216 | public event UpdatePrimTexture OnUpdatePrimTexture; | 217 | public event UpdatePrimTexture OnUpdatePrimTexture; |
217 | public event UpdateVector OnUpdatePrimGroupPosition; | 218 | public event UpdateVector OnUpdatePrimGroupPosition; |
@@ -559,7 +560,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
559 | Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, | 560 | Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, |
560 | UUID objectID, UUID ownerID, string text, byte[] color, | 561 | UUID objectID, UUID ownerID, string text, byte[] color, |
561 | uint parentID, | 562 | uint parentID, |
562 | byte[] particleSystem, byte clickAction) | 563 | byte[] particleSystem, byte clickAction, byte material) |
563 | { | 564 | { |
564 | } | 565 | } |
565 | public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, | 566 | public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, |
@@ -567,7 +568,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
567 | Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, | 568 | Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, |
568 | UUID objectID, UUID ownerID, string text, byte[] color, | 569 | UUID objectID, UUID ownerID, string text, byte[] color, |
569 | uint parentID, | 570 | uint parentID, |
570 | byte[] particleSystem, byte clickAction, byte[] textureanimation, | 571 | byte[] particleSystem, byte clickAction, byte material, byte[] textureanimation, |
571 | bool attachment, uint AttachmentPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) | 572 | bool attachment, uint AttachmentPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) |
572 | { | 573 | { |
573 | } | 574 | } |