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/Client | |
| parent | Provide a configuration setting to control whether multiple taken objects are... (diff) | |
| parent | Merge branch 'master' into test-merge0418 (diff) | |
| download | opensim-SC-8533c63d8903d896da0bbbcebb00d48c4e2415f6.zip opensim-SC-8533c63d8903d896da0bbbcebb00d48c4e2415f6.tar.gz opensim-SC-8533c63d8903d896da0bbbcebb00d48c4e2415f6.tar.bz2 opensim-SC-8533c63d8903d896da0bbbcebb00d48c4e2415f6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index d1a0440..a604a2e 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -1337,12 +1337,12 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 1337 | // Need to translate to MXP somehow | 1337 | // Need to translate to MXP somehow |
| 1338 | } | 1338 | } |
| 1339 | 1339 | ||
| 1340 | public void SendObjectPropertiesFamilyData(uint RequestFlags, UUID ObjectUUID, UUID OwnerID, UUID GroupID, uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask, uint NextOwnerMask, int OwnershipCost, byte SaleType, int SalePrice, uint Category, UUID LastOwnerID, string ObjectName, string Description) | 1340 | public void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags) |
| 1341 | { | 1341 | { |
| 1342 | //throw new System.NotImplementedException(); | 1342 | //throw new System.NotImplementedException(); |
| 1343 | } | 1343 | } |
| 1344 | 1344 | ||
| 1345 | public void SendObjectPropertiesReply(UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID, UUID FromTaskUUID, UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID, UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName, string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask, uint BaseMask, byte saleType, int salePrice) | 1345 | public void SendObjectPropertiesReply(ISceneEntity entity) |
| 1346 | { | 1346 | { |
| 1347 | //throw new System.NotImplementedException(); | 1347 | //throw new System.NotImplementedException(); |
| 1348 | } | 1348 | } |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index fc27f01..d8cd0ac 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
| @@ -884,12 +884,12 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
| 884 | throw new System.NotImplementedException(); | 884 | throw new System.NotImplementedException(); |
| 885 | } | 885 | } |
| 886 | 886 | ||
| 887 | public void SendObjectPropertiesFamilyData(uint RequestFlags, UUID ObjectUUID, UUID OwnerID, UUID GroupID, uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask, uint NextOwnerMask, int OwnershipCost, byte SaleType, int SalePrice, uint Category, UUID LastOwnerID, string ObjectName, string Description) | 887 | public void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags) |
| 888 | { | 888 | { |
| 889 | throw new System.NotImplementedException(); | 889 | throw new System.NotImplementedException(); |
| 890 | } | 890 | } |
| 891 | 891 | ||
| 892 | public void SendObjectPropertiesReply(UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID, UUID FromTaskUUID, UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID, UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName, string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask, uint BaseMask, byte saleType, int salePrice) | 892 | public void SendObjectPropertiesReply(ISceneEntity entity) |
| 893 | { | 893 | { |
| 894 | throw new System.NotImplementedException(); | 894 | throw new System.NotImplementedException(); |
| 895 | } | 895 | } |