aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/IClientAPI.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-03 12:00:13 +0000
committerMelanie Thielker2008-10-03 12:00:13 +0000
commit7f007d8ed056359d1e391cb73d9ff5c3b6852a26 (patch)
tree3241b8ea7d97fb9b1ca094217172d7f38cb75b2d /OpenSim/Framework/IClientAPI.cs
parent* EventQueueGet is now working. (diff)
downloadopensim-SC-7f007d8ed056359d1e391cb73d9ff5c3b6852a26.zip
opensim-SC-7f007d8ed056359d1e391cb73d9ff5c3b6852a26.tar.gz
opensim-SC-7f007d8ed056359d1e391cb73d9ff5c3b6852a26.tar.bz2
opensim-SC-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/Framework/IClientAPI.cs5
1 files changed, 3 insertions, 2 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
422 event GenericCall7 OnObjectDescription; 422 event GenericCall7 OnObjectDescription;
423 event GenericCall7 OnObjectName; 423 event GenericCall7 OnObjectName;
424 event GenericCall7 OnObjectClickAction; 424 event GenericCall7 OnObjectClickAction;
425 event GenericCall7 OnObjectMaterial;
425 event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; 426 event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
426 event UpdatePrimFlags OnUpdatePrimFlags; 427 event UpdatePrimFlags OnUpdatePrimFlags;
427 event UpdatePrimTexture OnUpdatePrimTexture; 428 event UpdatePrimTexture OnUpdatePrimTexture;
@@ -593,13 +594,13 @@ namespace OpenSim.Framework
593 Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, 594 Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel,
594 uint flags, 595 uint flags,
595 UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, 596 UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem,
596 byte clickAction, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius); 597 byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius);
597 598
598 599
599 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, 600 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
600 Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, 601 Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel,
601 uint flags, UUID objectID, UUID ownerID, string text, byte[] color, 602 uint flags, UUID objectID, UUID ownerID, string text, byte[] color,
602 uint parentID, byte[] particleSystem, byte clickAction); 603 uint parentID, byte[] particleSystem, byte clickAction, byte material);
603 604
604 605
605 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, 606 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,