diff options
| author | Melanie | 2011-04-18 20:17:29 +0100 |
|---|---|---|
| committer | Melanie | 2011-04-18 20:17:29 +0100 |
| commit | d1913f24295e0235ec31c1c546aece7de2209479 (patch) | |
| tree | 548e2b8828d5292b05b40cc33036e77880099007 /OpenSim/Region/OptionalModules/Agent | |
| parent | Fix up client implementations (diff) | |
| parent | Merge branch 'master' into test-merge0418 (diff) | |
| download | opensim-SC_OLD-d1913f24295e0235ec31c1c546aece7de2209479.zip opensim-SC_OLD-d1913f24295e0235ec31c1c546aece7de2209479.tar.gz opensim-SC_OLD-d1913f24295e0235ec31c1c546aece7de2209479.tar.bz2 opensim-SC_OLD-d1913f24295e0235ec31c1c546aece7de2209479.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 6c266bb..07af201 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1338,14 +1338,13 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1338 | 1338 | ||
| 1339 | } | 1339 | } |
| 1340 | 1340 | ||
| 1341 | 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) | 1341 | public void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags) |
| 1342 | { | 1342 | { |
| 1343 | 1343 | ||
| 1344 | } | 1344 | } |
| 1345 | 1345 | ||
| 1346 | 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) | 1346 | public void SendObjectPropertiesReply(ISceneEntity entity) |
| 1347 | { | 1347 | { |
| 1348 | |||
| 1349 | } | 1348 | } |
| 1350 | 1349 | ||
| 1351 | public void SendAgentOffline(UUID[] agentIDs) | 1350 | public void SendAgentOffline(UUID[] agentIDs) |