aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples
diff options
context:
space:
mode:
authorMic Bowman2011-04-12 12:39:02 -0700
committerMic Bowman2011-04-12 12:39:02 -0700
commit3afddb9033e155ebacdc36ce0d3775534c073523 (patch)
tree9d957e3a5895057724ba71bf1bc6377ae9c1a159 /OpenSim/Region/Examples
parentMerge branch 'master' into queuetest (diff)
parentFirst pass at moving object property requests into a queue similar (diff)
downloadopensim-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/Region/Examples')
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs12
1 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index d939329..89e9e20 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -702,18 +702,12 @@ namespace OpenSim.Region.Examples.SimpleModule
702 { 702 {
703 } 703 }
704 704
705 public void SendObjectPropertiesFamilyData(uint RequestFlags, UUID ObjectUUID, UUID OwnerID, UUID GroupID, 705 public void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags)
706 uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask,
707 uint NextOwnerMask, int OwnershipCost, byte SaleType,int SalePrice, uint Category,
708 UUID LastOwnerID, string ObjectName, string Description)
709 { 706 {
707
710 } 708 }
711 709
712 public void SendObjectPropertiesReply(UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID, UUID FromTaskUUID, 710 public void SendObjectPropertiesReply(ISceneEntity entity)
713 UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID,
714 UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName,
715 string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask,
716 uint BaseMask, byte saleType, int salePrice)
717 { 711 {
718 } 712 }
719 713