diff options
author | Justin Clark-Casey (justincc) | 2011-04-18 20:36:26 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-04-18 20:36:26 +0100 |
commit | 8533c63d8903d896da0bbbcebb00d48c4e2415f6 (patch) | |
tree | 95f0db9dc79a1d51def32b491df0c9913ad2c45b /OpenSim/Region/OptionalModules/World/NPC | |
parent | Provide a configuration setting to control whether multiple taken objects are... (diff) | |
parent | Merge branch 'master' into test-merge0418 (diff) | |
download | opensim-SC_OLD-8533c63d8903d896da0bbbcebb00d48c4e2415f6.zip opensim-SC_OLD-8533c63d8903d896da0bbbcebb00d48c4e2415f6.tar.gz opensim-SC_OLD-8533c63d8903d896da0bbbcebb00d48c4e2415f6.tar.bz2 opensim-SC_OLD-8533c63d8903d896da0bbbcebb00d48c4e2415f6.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 96760a2..2504e30 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -786,18 +786,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
786 | { | 786 | { |
787 | } | 787 | } |
788 | 788 | ||
789 | public void SendObjectPropertiesFamilyData(uint RequestFlags, UUID ObjectUUID, UUID OwnerID, UUID GroupID, | 789 | public void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags) |
790 | uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask, | ||
791 | uint NextOwnerMask, int OwnershipCost, byte SaleType, int SalePrice, uint Category, | ||
792 | UUID LastOwnerID, string ObjectName, string Description) | ||
793 | { | 790 | { |
791 | |||
794 | } | 792 | } |
795 | 793 | ||
796 | public void SendObjectPropertiesReply(UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID, UUID FromTaskUUID, | 794 | public void SendObjectPropertiesReply(ISceneEntity entity) |
797 | UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID, | ||
798 | UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName, | ||
799 | string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask, | ||
800 | uint BaseMask, byte saleType, int salePrice) | ||
801 | { | 795 | { |
802 | } | 796 | } |
803 | 797 | ||