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/Framework | |
parent | Fix up client implementations (diff) | |
parent | Merge branch 'master' into test-merge0418 (diff) | |
download | opensim-SC-d1913f24295e0235ec31c1c546aece7de2209479.zip opensim-SC-d1913f24295e0235ec31c1c546aece7de2209479.tar.gz opensim-SC-d1913f24295e0235ec31c1c546aece7de2209479.tar.bz2 opensim-SC-d1913f24295e0235ec31c1c546aece7de2209479.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 10 |
2 files changed, 7 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 69bfb9a..b100b39 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2111,10 +2111,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
2111 | /// <param name="part"></param> | 2111 | /// <param name="part"></param> |
2112 | public void ServiceObjectPropertiesFamilyRequest(IClientAPI remoteClient, UUID AgentID, uint RequestFlags) | 2112 | public void ServiceObjectPropertiesFamilyRequest(IClientAPI remoteClient, UUID AgentID, uint RequestFlags) |
2113 | { | 2113 | { |
2114 | remoteClient.SendObjectPropertiesFamilyData(RequestFlags, RootPart.UUID, RootPart.OwnerID, RootPart.GroupID, RootPart.BaseMask, | 2114 | remoteClient.SendObjectPropertiesFamilyData(RootPart, RequestFlags); |
2115 | RootPart.OwnerMask, RootPart.GroupMask, RootPart.EveryoneMask, RootPart.NextOwnerMask, | 2115 | |
2116 | RootPart.OwnershipCost, RootPart.ObjectSaleType, RootPart.SalePrice, RootPart.Category, | 2116 | // remoteClient.SendObjectPropertiesFamilyData(RequestFlags, RootPart.UUID, RootPart.OwnerID, RootPart.GroupID, RootPart.BaseMask, |
2117 | RootPart.CreatorID, RootPart.Name, RootPart.Description); | 2117 | // RootPart.OwnerMask, RootPart.GroupMask, RootPart.EveryoneMask, RootPart.NextOwnerMask, |
2118 | // RootPart.OwnershipCost, RootPart.ObjectSaleType, RootPart.SalePrice, RootPart.Category, | ||
2119 | // RootPart.CreatorID, RootPart.Name, RootPart.Description); | ||
2118 | } | 2120 | } |
2119 | 2121 | ||
2120 | public void SetPartOwner(SceneObjectPart part, UUID cAgentID, UUID cGroupID) | 2122 | public void SetPartOwner(SceneObjectPart part, UUID cAgentID, UUID cGroupID) |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 9b9f280..e7e3014 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2093,15 +2093,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2093 | 2093 | ||
2094 | public void GetProperties(IClientAPI client) | 2094 | public void GetProperties(IClientAPI client) |
2095 | { | 2095 | { |
2096 | //Viewer wants date in microseconds so multiply it by 1,000,000. | 2096 | client.SendObjectPropertiesReply(this); |
2097 | client.SendObjectPropertiesReply( | ||
2098 | m_fromUserInventoryItemID, (ulong)_creationDate*(ulong)1e6, _creatorID, UUID.Zero, UUID.Zero, | ||
2099 | _groupID, (short)InventorySerial, _lastOwnerID, UUID, _ownerID, | ||
2100 | ParentGroup.RootPart.TouchName, new byte[0], ParentGroup.RootPart.SitName, Name, Description, | ||
2101 | ParentGroup.RootPart._ownerMask, ParentGroup.RootPart._nextOwnerMask, ParentGroup.RootPart._groupMask, ParentGroup.RootPart._everyoneMask, | ||
2102 | ParentGroup.RootPart._baseMask, | ||
2103 | ParentGroup.RootPart.ObjectSaleType, | ||
2104 | ParentGroup.RootPart.SalePrice); | ||
2105 | } | 2097 | } |
2106 | 2098 | ||
2107 | public UUID GetRootPartUUID() | 2099 | public UUID GetRootPartUUID() |