diff options
author | Mic Bowman | 2011-04-12 12:39:02 -0700 |
---|---|---|
committer | Mic Bowman | 2011-04-12 12:39:02 -0700 |
commit | 3afddb9033e155ebacdc36ce0d3775534c073523 (patch) | |
tree | 9d957e3a5895057724ba71bf1bc6377ae9c1a159 /OpenSim/Tests | |
parent | Merge branch 'master' into queuetest (diff) | |
parent | First pass at moving object property requests into a queue similar (diff) | |
download | opensim-SC_OLD-3afddb9033e155ebacdc36ce0d3775534c073523.zip opensim-SC_OLD-3afddb9033e155ebacdc36ce0d3775534c073523.tar.gz opensim-SC_OLD-3afddb9033e155ebacdc36ce0d3775534c073523.tar.bz2 opensim-SC_OLD-3afddb9033e155ebacdc36ce0d3775534c073523.tar.xz |
Merge branch 'test-select' into queuetest
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index d1dc17f..dca5626 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -816,18 +816,11 @@ namespace OpenSim.Tests.Common.Mock | |||
816 | { | 816 | { |
817 | } | 817 | } |
818 | 818 | ||
819 | public void SendObjectPropertiesFamilyData(uint RequestFlags, UUID ObjectUUID, UUID OwnerID, UUID GroupID, | 819 | public void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags) |
820 | uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask, | ||
821 | uint NextOwnerMask, int OwnershipCost, byte SaleType,int SalePrice, uint Category, | ||
822 | UUID LastOwnerID, string ObjectName, string Description) | ||
823 | { | 820 | { |
824 | } | 821 | } |
825 | 822 | ||
826 | public void SendObjectPropertiesReply(UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID, UUID FromTaskUUID, | 823 | public void SendObjectPropertiesReply(ISceneEntity entity) |
827 | UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID, | ||
828 | UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName, | ||
829 | string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask, | ||
830 | uint BaseMask, byte saleType, int salePrice) | ||
831 | { | 824 | { |
832 | } | 825 | } |
833 | 826 | ||