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/Region/Framework/Scenes/SceneObjectGroup.cs | |
| 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 '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index ca7d9d9..30563d4 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1765,10 +1765,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1765 | /// <param name="part"></param> | 1765 | /// <param name="part"></param> |
| 1766 | public void ServiceObjectPropertiesFamilyRequest(IClientAPI remoteClient, UUID AgentID, uint RequestFlags) | 1766 | public void ServiceObjectPropertiesFamilyRequest(IClientAPI remoteClient, UUID AgentID, uint RequestFlags) |
| 1767 | { | 1767 | { |
| 1768 | remoteClient.SendObjectPropertiesFamilyData(RequestFlags, RootPart.UUID, RootPart.OwnerID, RootPart.GroupID, RootPart.BaseMask, | 1768 | remoteClient.SendObjectPropertiesFamilyData(RootPart, RequestFlags); |
| 1769 | RootPart.OwnerMask, RootPart.GroupMask, RootPart.EveryoneMask, RootPart.NextOwnerMask, | 1769 | |
| 1770 | RootPart.OwnershipCost, RootPart.ObjectSaleType, RootPart.SalePrice, RootPart.Category, | 1770 | // remoteClient.SendObjectPropertiesFamilyData(RequestFlags, RootPart.UUID, RootPart.OwnerID, RootPart.GroupID, RootPart.BaseMask, |
| 1771 | RootPart.CreatorID, RootPart.Name, RootPart.Description); | 1771 | // RootPart.OwnerMask, RootPart.GroupMask, RootPart.EveryoneMask, RootPart.NextOwnerMask, |
| 1772 | // RootPart.OwnershipCost, RootPart.ObjectSaleType, RootPart.SalePrice, RootPart.Category, | ||
| 1773 | // RootPart.CreatorID, RootPart.Name, RootPart.Description); | ||
| 1772 | } | 1774 | } |
| 1773 | 1775 | ||
| 1774 | public void SetPartOwner(SceneObjectPart part, UUID cAgentID, UUID cGroupID) | 1776 | public void SetPartOwner(SceneObjectPart part, UUID cAgentID, UUID cGroupID) |