diff options
author | Mic Bowman | 2011-04-12 12:36:36 -0700 |
---|---|---|
committer | Mic Bowman | 2011-04-13 15:37:25 -0700 |
commit | 3fe22126ca3974b2a10365121ee0141fb54806e6 (patch) | |
tree | d0373a62acefe93d4023c5eeb179fb6645d059bc /OpenSim/Region/Framework/Scenes | |
parent | New tokenbucket algorithm. This one provides fair sharing of the queues (diff) | |
download | opensim-SC_OLD-3fe22126ca3974b2a10365121ee0141fb54806e6.zip opensim-SC_OLD-3fe22126ca3974b2a10365121ee0141fb54806e6.tar.gz opensim-SC_OLD-3fe22126ca3974b2a10365121ee0141fb54806e6.tar.bz2 opensim-SC_OLD-3fe22126ca3974b2a10365121ee0141fb54806e6.tar.xz |
First pass at moving object property requests into a queue similar
to the entity update queue. The number of property packets can
become significant when selecting/deselecting large numbers of
objects.
This is experimental code.
Diffstat (limited to '')
-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 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) |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index ce1e6b8..8a8a699 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2055,15 +2055,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2055 | 2055 | ||
2056 | public void GetProperties(IClientAPI client) | 2056 | public void GetProperties(IClientAPI client) |
2057 | { | 2057 | { |
2058 | //Viewer wants date in microseconds so multiply it by 1,000,000. | 2058 | client.SendObjectPropertiesReply(this); |
2059 | client.SendObjectPropertiesReply( | ||
2060 | m_fromUserInventoryItemID, (ulong)_creationDate*(ulong)1e6, _creatorID, UUID.Zero, UUID.Zero, | ||
2061 | _groupID, (short)InventorySerial, _lastOwnerID, UUID, _ownerID, | ||
2062 | ParentGroup.RootPart.TouchName, new byte[0], ParentGroup.RootPart.SitName, Name, Description, | ||
2063 | ParentGroup.RootPart._ownerMask, ParentGroup.RootPart._nextOwnerMask, ParentGroup.RootPart._groupMask, ParentGroup.RootPart._everyoneMask, | ||
2064 | ParentGroup.RootPart._baseMask, | ||
2065 | ParentGroup.RootPart.ObjectSaleType, | ||
2066 | ParentGroup.RootPart.SalePrice); | ||
2067 | } | 2059 | } |
2068 | 2060 | ||
2069 | public UUID GetRootPartUUID() | 2061 | public UUID GetRootPartUUID() |