diff options
author | Mic Bowman | 2011-02-04 14:22:17 -0800 |
---|---|---|
committer | Mic Bowman | 2011-02-04 14:22:17 -0800 |
commit | bb69a40fbb563503e594bc9576a28c440a808ef2 (patch) | |
tree | b5246768e592bf80c396a4d2df377059097322f8 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Convert SimianMaptile refresh time from ms to seconds. Too many 0's (diff) | |
parent | minor: fix indentation, spacing on commit 3585130 (diff) | |
download | opensim-SC_OLD-bb69a40fbb563503e594bc9576a28c440a808ef2.zip opensim-SC_OLD-bb69a40fbb563503e594bc9576a28c440a808ef2.tar.gz opensim-SC_OLD-bb69a40fbb563503e594bc9576a28c440a808ef2.tar.bz2 opensim-SC_OLD-bb69a40fbb563503e594bc9576a28c440a808ef2.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 4fcd8f5..6a92378 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2055,8 +2055,9 @@ 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( | 2059 | client.SendObjectPropertiesReply( |
2059 | m_fromUserInventoryItemID, (ulong)_creationDate, _creatorID, UUID.Zero, UUID.Zero, | 2060 | m_fromUserInventoryItemID, (ulong)_creationDate*(ulong)1e6, _creatorID, UUID.Zero, UUID.Zero, |
2060 | _groupID, (short)InventorySerial, _lastOwnerID, UUID, _ownerID, | 2061 | _groupID, (short)InventorySerial, _lastOwnerID, UUID, _ownerID, |
2061 | ParentGroup.RootPart.TouchName, new byte[0], ParentGroup.RootPart.SitName, Name, Description, | 2062 | ParentGroup.RootPart.TouchName, new byte[0], ParentGroup.RootPart.SitName, Name, Description, |
2062 | ParentGroup.RootPart._ownerMask, ParentGroup.RootPart._nextOwnerMask, ParentGroup.RootPart._groupMask, ParentGroup.RootPart._everyoneMask, | 2063 | ParentGroup.RootPart._ownerMask, ParentGroup.RootPart._nextOwnerMask, ParentGroup.RootPart._groupMask, ParentGroup.RootPart._everyoneMask, |