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/Framework/Scenes/SceneObjectGroup.cs | |
| 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 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -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 9bb50db..19a9506 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1772,10 +1772,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1772 | /// <param name="part"></param> | 1772 | /// <param name="part"></param> |
| 1773 | public void ServiceObjectPropertiesFamilyRequest(IClientAPI remoteClient, UUID AgentID, uint RequestFlags) | 1773 | public void ServiceObjectPropertiesFamilyRequest(IClientAPI remoteClient, UUID AgentID, uint RequestFlags) |
| 1774 | { | 1774 | { |
| 1775 | remoteClient.SendObjectPropertiesFamilyData(RequestFlags, RootPart.UUID, RootPart.OwnerID, RootPart.GroupID, RootPart.BaseMask, | 1775 | remoteClient.SendObjectPropertiesFamilyData(RootPart, RequestFlags); |
| 1776 | RootPart.OwnerMask, RootPart.GroupMask, RootPart.EveryoneMask, RootPart.NextOwnerMask, | 1776 | |
| 1777 | RootPart.OwnershipCost, RootPart.ObjectSaleType, RootPart.SalePrice, RootPart.Category, | 1777 | // remoteClient.SendObjectPropertiesFamilyData(RequestFlags, RootPart.UUID, RootPart.OwnerID, RootPart.GroupID, RootPart.BaseMask, |
| 1778 | RootPart.CreatorID, RootPart.Name, RootPart.Description); | 1778 | // RootPart.OwnerMask, RootPart.GroupMask, RootPart.EveryoneMask, RootPart.NextOwnerMask, |
| 1779 | // RootPart.OwnershipCost, RootPart.ObjectSaleType, RootPart.SalePrice, RootPart.Category, | ||
| 1780 | // RootPart.CreatorID, RootPart.Name, RootPart.Description); | ||
| 1779 | } | 1781 | } |
| 1780 | 1782 | ||
| 1781 | public void SetPartOwner(SceneObjectPart part, UUID cAgentID, UUID cGroupID) | 1783 | public void SetPartOwner(SceneObjectPart part, UUID cAgentID, UUID cGroupID) |